Skip to content

Commit 9e8d1ef

Browse files
authored
feat(unittest): Small improvements in unittests (#13064)
1 parent 72469b8 commit 9e8d1ef

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

unittests/test_parsers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def test_file_existence(self):
9696
read_true = False
9797
i = 0
9898
elif i > 4:
99-
self.assertTrue(expr=False, msg=f"In file '{f_path}' the test is failing because you don't have utf-8 after .read()")
99+
self.fail(f"In file '{f_path}' the test is failing because you don't have utf-8 after .read()")
100100
i = 0
101101
read_true = False
102102
else:

unittests/test_sla_calculations.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ def test_mitigated_inside_sla(self):
9595
self.assertEqual(initial_sla_expiration_date, finding.sla_expiration_date)
9696
self.assertEqual((self.now + relativedelta(days=self.sla_config.high)).date(), finding.sla_expiration_date)
9797
self.assertEqual(20, finding.sla_days_remaining())
98-
self.assertTrue("within SLA" in finding_sla(finding))
99-
self.assertTrue(">20<" in finding_sla(finding))
98+
self.assertIn("within SLA", finding_sla(finding))
99+
self.assertIn(">20<", finding_sla(finding))
100100

101101
with patch("django.db.models.fields.timezone.now") as mock_now:
102102
mock_now.return_value = self.now + relativedelta(days=20)
@@ -109,8 +109,8 @@ def test_mitigated_inside_sla(self):
109109
self.assertEqual(initial_sla_expiration_date, finding.sla_expiration_date)
110110
self.assertEqual((self.now + relativedelta(days=self.sla_config.high)).date(), finding.sla_expiration_date)
111111
self.assertEqual(20, finding.sla_days_remaining())
112-
self.assertTrue("within SLA" in finding_sla(finding))
113-
self.assertTrue(">20<" in finding_sla(finding))
112+
self.assertIn("within SLA", finding_sla(finding))
113+
self.assertIn(">20<", finding_sla(finding))
114114

115115
# Finding mitigated outside SLA should have correct sla_expiration_date and days_remaining
116116
def test_mitigated_outside_sla(self):

unittests/tools/test_twistlock_parser.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_parse_file_with_one_vuln_and_compliance(self):
4141
# Verify compliance finding has image metadata in impact field
4242
self.assertIn("Image ID:", finding.impact)
4343
self.assertIn("Distribution:", finding.impact)
44-
self.assertTrue("\n" in finding.impact)
44+
self.assertIn("\n", finding.impact)
4545
else:
4646
# Verify vulnerability finding exists and has correct properties
4747
self.assertIsNotNone(finding)
@@ -52,7 +52,7 @@ def test_parse_file_with_one_vuln_and_compliance(self):
5252
self.assertIn("Image ID:", finding.impact)
5353
self.assertIn("Distribution:", finding.impact)
5454
self.assertIn("Debian GNU/Linux 9", finding.impact)
55-
self.assertTrue("\n" in finding.impact)
55+
self.assertIn("\n", finding.impact)
5656

5757
def test_parse_csv_with_timestamps_and_metadata(self):
5858
testfile = (
@@ -69,8 +69,8 @@ def test_parse_csv_with_timestamps_and_metadata(self):
6969
# Verify timestamp parsing (Item 4)
7070
self.assertIsNotNone(finding.date)
7171
# Should use Published date (2020-09-04) or Discovered date (2020-09-29)
72-
self.assertTrue(finding.date.year == 2020)
73-
self.assertTrue(finding.date.month in {9, 1, 11, 12}) # Various months from the test data
72+
self.assertEqual(finding.date.year, 2020)
73+
self.assertIn(finding.date.month, {9, 1, 11, 12}) # Various months from the test data
7474

7575
# Verify metadata in impact field (Item 3) - now separated by newlines
7676
self.assertIn("Registry:", finding.impact)

0 commit comments

Comments
 (0)