Update announcement banner tests to check for data-source attribute

Author: Maffooch

tests/announcement_banner_test.py

@@ -41,7 +41,7 @@ def disable_announcement(self):
     def test_create_announcement(self):
         driver = self.driver
         driver.get(self.base_url)
-        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner"))
+        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])"))
 
         text = "Big important announcement, definitely pay attention!"
         self.enable_announcement(text, dismissable=False, style=self.type)
@@ -56,7 +56,7 @@ def test_create_announcement(self):
     def test_create_dismissable_announcement(self):
         driver = self.driver
         driver.get(self.base_url)
-        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner"))
+        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])"))
 
         text = "Big important announcement, definitely pay don't dismiss this one."
         self.enable_announcement(text, dismissable=True, style=self.type)
@@ -77,7 +77,7 @@ def test_create_dismissable_announcement(self):
     def test_dismissing_announcement_does_not_dismiss_for_others(self):
         driver = self.driver
         driver.get(self.base_url)
-        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner"))
+        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])"))
 
         text = "Everyone sees this, right?"
         self.enable_announcement(text, dismissable=True, style=self.type)
@@ -103,7 +103,7 @@ def test_dismissing_announcement_does_not_dismiss_for_others(self):
     def test_announcement_ui_disabled_when_set(self):
         driver = self.driver
         driver.get(self.base_url)
-        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner"))
+        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])"))
 
         text = "The most important announcement of the year."
         self.enable_announcement(text, dismissable=False, style=self.type)
@@ -121,7 +121,7 @@ def test_announcement_ui_disabled_when_set(self):
     def test_announcement_empty_after_removal(self):
         driver = self.driver
         driver.get(self.base_url)
-        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner"))
+        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])"))
 
         text = "Surely no-one would delete this announcement quickly"
         self.enable_announcement(text, dismissable=False, style=self.type)
@@ -139,7 +139,7 @@ def test_announcement_empty_after_removal(self):
     def test_html_announcement(self):
         driver = self.driver
         driver.get(self.base_url)
-        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner"))
+        self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])"))
 
         text = "Links in announcements? <a href='https://github.com/DefectDojo/django-DefectDojo' style='color: #224477;' target='_blank'>you bet!</a>"
         self.enable_announcement(text, dismissable=False, style=self.type)

unittests/test_importers_performance.py

@@ -576,7 +576,7 @@ def test_import_reimport_reimport_performance_pghistory_async(self):
 
         self._import_reimport_performance(
             expected_num_queries1=146,
-            expected_num_async_tasks1=1,
+            expected_num_async_tasks1=2,
             expected_num_queries2=124,
             expected_num_async_tasks2=1,
             expected_num_queries3=37,
@@ -599,8 +599,8 @@ def test_import_reimport_reimport_performance_pghistory_no_async(self):
         testuser.usercontactinfo.save()
 
         self._import_reimport_performance(
-            expected_num_queries1=155,
-            expected_num_async_tasks1=1,
+            expected_num_queries1=161,
+            expected_num_async_tasks1=2,
             expected_num_queries2=133,
             expected_num_async_tasks2=1,
             expected_num_queries3=46,
@@ -624,8 +624,8 @@ def test_import_reimport_reimport_performance_pghistory_no_async_with_product_gr
         self.system_settings(enable_product_grade=True)
 
         self._import_reimport_performance(
-            expected_num_queries1=165,
-            expected_num_async_tasks1=3,
+            expected_num_queries1=171,
+            expected_num_async_tasks1=4,
             expected_num_queries2=143,
             expected_num_async_tasks2=3,
             expected_num_queries3=50,
@@ -725,9 +725,9 @@ def test_deduplication_performance_pghistory_async(self):
 
         self._deduplication_performance(
             expected_num_queries1=81,
-            expected_num_async_tasks1=1,
-            expected_num_queries2=72,
-            expected_num_async_tasks2=1,
+            expected_num_async_tasks1=2,
+            expected_num_queries2=69,
+            expected_num_async_tasks2=2,
             check_duplicates=False,  # Async mode - deduplication happens later
         )
 
@@ -744,8 +744,8 @@ def test_deduplication_performance_pghistory_no_async(self):
         testuser.usercontactinfo.save()
 
         self._deduplication_performance(
-            expected_num_queries1=90,
-            expected_num_async_tasks1=1,
-            expected_num_queries2=188,
-            expected_num_async_tasks2=1,
+            expected_num_queries1=96,
+            expected_num_async_tasks1=2,
+            expected_num_queries2=191,
+            expected_num_async_tasks2=2,
         )