Skip to content

Commit 7b600ea

Browse files
committed
Use django.utils.timezone.now() instead of datetime.now() in tests
1 parent 0fe9ffa commit 7b600ea

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

vulnerabilities/tests/pipelines/test_compute_advisory_todo_v2.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
# See https://aboutcode.org for more information about nexB OSS projects.
88
#
99

10-
from datetime import datetime
11-
from datetime import timezone
12-
1310
from django.test import TestCase
11+
from django.utils import timezone
1412
from packageurl import PackageURL
1513

1614
from vulnerabilities.importer import AdvisoryDataV2
@@ -80,7 +78,7 @@ def setUp(self):
8078
)
8179

8280
def test_advisory_todo_missing_summary(self):
83-
date = datetime.now()
81+
date = timezone.now()
8482
adv = AdvisoryV2.objects.create(
8583
unique_content_id="test_id",
8684
url=self.advisory_data1.url,
@@ -106,7 +104,7 @@ def test_advisory_todo_missing_summary(self):
106104
self.assertEqual(1, todo.advisories.count())
107105

108106
def test_advisory_todo_missing_fixed(self):
109-
date = datetime.now()
107+
date = timezone.now()
110108
adv = AdvisoryV2.objects.create(
111109
unique_content_id="test_id",
112110
url=self.advisory_data2.url,
@@ -132,7 +130,7 @@ def test_advisory_todo_missing_fixed(self):
132130
self.assertEqual(1, todo.advisories.count())
133131

134132
def test_advisory_todo_missing_affected(self):
135-
date = datetime.now()
133+
date = timezone.now()
136134
adv = AdvisoryV2.objects.create(
137135
unique_content_id="test_id",
138136
url=self.advisory_data3.url,
@@ -159,7 +157,7 @@ def test_advisory_todo_missing_affected(self):
159157

160158
def test_advisory_todo_conflicting_fixed_affected(self):
161159
alias = AdvisoryAlias.objects.create(alias="CVE-0000-0000")
162-
date = datetime.now()
160+
date = timezone.now()
163161
adv1 = AdvisoryV2.objects.create(
164162
unique_content_id="test_id1",
165163
url=self.advisory_data1.url,
@@ -211,7 +209,7 @@ def test_advisory_todo_conflicting_fixed_affected(self):
211209
def test_relate_advisories_by_aliases_creates_todo(self):
212210
"""Two advisories from different datasources sharing an alias get flagged."""
213211
alias = AdvisoryAlias.objects.create(alias="CVE-2021-9999")
214-
date = datetime.now(timezone.utc)
212+
date = timezone.now()
215213

216214
adv1 = AdvisoryV2.objects.create(
217215
unique_content_id="alias_test_id1",
@@ -245,7 +243,7 @@ def test_relate_advisories_by_aliases_creates_todo(self):
245243
def test_relate_advisories_by_aliases_same_datasource_not_flagged(self):
246244
"""Two advisories from the same datasource sharing an alias are not flagged."""
247245
alias = AdvisoryAlias.objects.create(alias="CVE-2021-8888")
248-
date = datetime.now(timezone.utc)
246+
date = timezone.now()
249247

250248
adv1 = AdvisoryV2.objects.create(
251249
unique_content_id="same_ds_id1",
@@ -278,7 +276,7 @@ def test_relate_advisories_by_aliases_same_datasource_not_flagged(self):
278276
def test_detect_similar_summaries_creates_todo(self):
279277
"""Two advisories from different datasources with similar summaries get flagged."""
280278
alias = AdvisoryAlias.objects.create(alias="CVE-2021-7777")
281-
date = datetime.now(timezone.utc)
279+
date = timezone.now()
282280

283281
adv1 = AdvisoryV2.objects.create(
284282
unique_content_id="sim_sum_id1",
@@ -313,7 +311,7 @@ def test_detect_similar_summaries_creates_todo(self):
313311
def test_detect_similar_summaries_below_threshold_not_flagged(self):
314312
"""Two advisories with very different summaries are not flagged."""
315313
alias = AdvisoryAlias.objects.create(alias="CVE-2021-6666")
316-
date = datetime.now(timezone.utc)
314+
date = timezone.now()
317315

318316
adv1 = AdvisoryV2.objects.create(
319317
unique_content_id="diff_sum_id1",
@@ -346,7 +344,7 @@ def test_detect_similar_summaries_below_threshold_not_flagged(self):
346344
def test_detect_similar_summaries_empty_summary_skipped(self):
347345
"""Advisories with empty summaries are not compared for similarity."""
348346
alias = AdvisoryAlias.objects.create(alias="CVE-2021-5555")
349-
date = datetime.now(timezone.utc)
347+
date = timezone.now()
350348

351349
adv1 = AdvisoryV2.objects.create(
352350
unique_content_id="empty_sum_id1",

0 commit comments

Comments
 (0)