Fix some

kiblik · Feb 7, 2024 · dc6895d · dc6895d
1 parent 8cf6871
commit dc6895d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/unittests/test_bulk_risk_acceptance_api.py b/unittests/test_bulk_risk_acceptance_api.py
@@ -18,25 +18,25 @@ def setUpTestData(cls):
         cls.product = Product.objects.create(prod_type=cls.product_type, name='Flopper', description='Test product')
         Product_Type_Member.objects.create(product_type=cls.product_type, user=cls.user, role=Role.objects.get(id=Roles.Owner))
         cls.product_2 = Product.objects.create(prod_type=cls.product_type, name='Flopper2', description='Test product2')
-        cls.engagement = Engagement.objects.create(product=cls.product, target_start=datetime.date(2000, 1, 1),
-                                                   target_end=datetime.date(2000, 2, 1))
-        cls.engagement_2a = Engagement.objects.create(product=cls.product_2, target_start=datetime.date(2000, 1, 1),
-                                                   target_end=datetime.date(2000, 2, 1))
-        cls.engagement_2b = Engagement.objects.create(product=cls.product_2, target_start=datetime.date(2000, 1, 1),
-                                                   target_end=datetime.date(2000, 2, 1))
+        cls.engagement = Engagement.objects.create(product=cls.product, target_start=datetime.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc),
+                                                   target_end=datetime.datetime(2000, 2, 1, tzinfo=datetime.timezone.utc))
+        cls.engagement_2a = Engagement.objects.create(product=cls.product_2, target_start=datetime.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc),
+                                                   target_end=datetime.datetime(2000, 2, 1, tzinfo=datetime.timezone.utc))
+        cls.engagement_2b = Engagement.objects.create(product=cls.product_2, target_start=datetime.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc),
+                                                   target_end=datetime.datetime(2000, 2, 1, tzinfo=datetime.timezone.utc))
 
         cls.test_type = Test_Type.objects.create(name='Risk Acceptance Mock Scan', static_tool=True)
         cls.test_a = Test.objects.create(engagement=cls.engagement, test_type=cls.test_type,
-                                         target_start=datetime.date(2000, 1, 1), target_end=datetime.date(2000, 2, 1))
+                                         target_start=datetime.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc), target_end=datetime.datetime(2000, 2, 1, tzinfo=datetime.timezone.utc))
         cls.test_b = Test.objects.create(engagement=cls.engagement, test_type=cls.test_type,
-                                         target_start=datetime.date(2000, 1, 1), target_end=datetime.date(2000, 2, 1))
+                                         target_start=datetime.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc), target_end=datetime.datetime(2000, 2, 1, tzinfo=datetime.timezone.utc))
         cls.test_c = Test.objects.create(engagement=cls.engagement, test_type=cls.test_type,
-                                         target_start=datetime.date(2000, 1, 1), target_end=datetime.date(2000, 2, 1))
+                                         target_start=datetime.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc), target_end=datetime.datetime(2000, 2, 1, tzinfo=datetime.timezone.utc))
 
         cls.test_d = Test.objects.create(engagement=cls.engagement_2a, test_type=cls.test_type,
-                                         target_start=datetime.date(2000, 1, 1), target_end=datetime.date(2000, 2, 1))
+                                         target_start=datetime.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc), target_end=datetime.datetime(2000, 2, 1, tzinfo=datetime.timezone.utc))
         cls.test_e = Test.objects.create(engagement=cls.engagement_2b, test_type=cls.test_type,
-                                         target_start=datetime.date(2000, 1, 1), target_end=datetime.date(2000, 2, 1))
+                                         target_start=datetime.datetime(2000, 1, 1, tzinfo=datetime.timezone.utc), target_end=datetime.datetime(2000, 2, 1, tzinfo=datetime.timezone.utc))
 
         def create_finding(test: Test, reporter: User, cve: str) -> Finding:
             return Finding(test=test, title='Finding {}'.format(cve), cve=cve, severity='High', verified=True,

diff --git a/unittests/test_finding_helper.py b/unittests/test_finding_helper.py
@@ -93,7 +93,7 @@ def test_mark_old_active_as_mitigated(self, mock_can_edit, mock_tz):
     def test_mark_old_active_as_mitigated_custom_edit(self, mock_can_edit, mock_tz):
         mock_tz.return_value = frozen_datetime
 
-        custom_mitigated = datetime.datetime.now()
+        custom_mitigated = datetime.datetime.now(datetime.timezone.utc)
 
         with impersonate(self.user_1):
             test = Test.objects.last()
@@ -115,7 +115,7 @@ def test_mark_old_active_as_mitigated_custom_edit(self, mock_can_edit, mock_tz):
     def test_update_old_mitigated_with_custom_edit(self, mock_can_edit, mock_tz):
         mock_tz.return_value = frozen_datetime
 
-        custom_mitigated = datetime.datetime.now()
+        custom_mitigated = datetime.datetime.now(datetime.timezone.utc)
 
         with impersonate(self.user_1):
             test = Test.objects.last()
@@ -137,7 +137,7 @@ def test_update_old_mitigated_with_custom_edit(self, mock_can_edit, mock_tz):
     def test_update_old_mitigated_with_missing_data(self, mock_can_edit, mock_tz):
         mock_tz.return_value = frozen_datetime
 
-        custom_mitigated = datetime.datetime.now()
+        custom_mitigated = datetime.datetime.now(datetime.timezone.utc)
 
         with impersonate(self.user_1):
             test = Test.objects.last()

diff --git a/unittests/test_flush_auditlog.py b/unittests/test_flush_auditlog.py
@@ -2,7 +2,7 @@
 from .dojo_test_case import DojoTestCase
 from django.test import override_settings
 from auditlog.models import LogEntry
-from datetime import date, datetime
+from datetime import date, datetime, timezone
 from dojo.models import Finding
 from dateutil.relativedelta import relativedelta
 import logging
@@ -29,8 +29,8 @@ def test_delete_all_entries(self):
 
     @override_settings(AUDITLOG_FLUSH_RETENTION_PERIOD=1)
     def test_delete_entries_with_retention_period(self):
-        entries_before = LogEntry.objects.filter(timestamp__date__lt=date.today()).count()
-        two_weeks_ago = datetime.today() - relativedelta(weeks=2)
+        entries_before = LogEntry.objects.filter(timestamp__date__lt=datetime.now(timezone.utc)).count()
+        two_weeks_ago = datetime.now(timezone.utc) - relativedelta(weeks=2)
         log_entry = LogEntry.objects.log_create(
             instance=Finding.objects.all()[0],
             timestamp=two_weeks_ago,
@@ -40,6 +40,6 @@ def test_delete_entries_with_retention_period(self):
         log_entry.timestamp = two_weeks_ago
         log_entry.save()
         flush_auditlog()
-        entries_after = LogEntry.objects.filter(timestamp__date__lt=date.today()).count()
+        entries_after = LogEntry.objects.filter(timestamp__date__lt=datetime.now(timezone.utc)).count()
         # we have three old log entries in our testdata and added a new one
         self.assertEqual(entries_before - 3 + 1, entries_after)
diff --git a/unittests/test_import_reimport.py b/unittests/test_import_reimport.py
@@ -1430,8 +1430,8 @@ def test_import_reimport_vulnerability_ids(self):
             engagement=test.engagement,
             test_type=test_type,
             scan_type=self.anchore_grype_scan_type,
-            target_start=datetime.datetime.now(),
-            target_end=datetime.datetime.now(),
+            target_start=datetime.datetime.now(datetime.timezone.utc),
+            target_end=datetime.datetime.now(datetime.timezone.utc),
         )
         reimport_test.save()
 

diff --git a/unittests/test_utils_deduplication_reopen.py b/unittests/test_utils_deduplication_reopen.py
@@ -14,7 +14,7 @@ def setUp(self):
         self.finding_a = Finding.objects.get(id=2)
         self.finding_a.pk = None
         self.finding_a.duplicate = False
-        self.finding_a.mitigated = datetime.date(1970, 1, 1)
+        self.finding_a.mitigated = datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)
         self.finding_a.is_mitigated = True
         self.finding_a.false_p = True
         self.finding_a.active = False