Fix tests

calebevans · calebevans · commit f1d6c0ba5176 · 2024-08-20T18:31:48.000-06:00
diff --git a/tests/unittests/conftest.py b/tests/unittests/conftest.py
@@ -221,6 +221,7 @@ def job(firewatch_config, build_id):
         name_safe="openshift-pipelines-interop-aws",
         build_id=build_id,
         gcs_bucket="test-platform-results",
+        gcs_creds_file=None,
         firewatch_config=firewatch_config,
     )
 
diff --git a/tests/unittests/functions/report/report_base_test.py b/tests/unittests/functions/report/report_base_test.py
@@ -38,7 +38,14 @@ def setUp(self, mock_jira):
             "src.objects.job.storage.Client.create_anonymous_client",
         )
         self.mock_storage_client.start().return_value = MagicMock()
-        self.job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        self.job = Job(
+            name="job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         self.report = Report(self.config, self.job)
 
     def tearDown(self):
diff --git a/tests/unittests/functions/report/test_firewatch_functions_report.py b/tests/unittests/functions/report/test_firewatch_functions_report.py
@@ -5,14 +5,28 @@
 
 class TestReport(ReportBaseTest):
     def test_report_initialization_with_job_rehearsal(self):
-        job = Job("rehearse-1234-job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         with self.assertRaises(SystemExit) as rc:
             Report(self.config, job)
         error = rc.exception
         self.assertEqual(error.code, 0)
 
     def test_report_initialization_with_job_rehearsal_flag_false_test_failures(self):
-        job = Job("rehearse-1234-job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         job.has_test_failures = True
         with self.assertRaises(SystemExit) as rc:
             Report(self.config, job)
@@ -21,15 +35,29 @@ def test_report_initialization_with_job_rehearsal_flag_false_test_failures(self)
 
     def test_report_initialization_with_job_rehearsal_flag_true_no_failures(self):
         self.config.fail_with_test_failures = True
-        job = Job("rehearse-1234-job1", "job1_safe", "123", "bucket1", self.config)
+        job = job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         with self.assertRaises(SystemExit) as rc:
             Report(self.config, job)
         error = rc.exception
         self.assertEqual(error.code, 0)
 
     def test_report_initialization_with_job_rehearsal_flag_true_test_failures(self):
         self.config.fail_with_test_failures = True
-        job = Job("rehearse-1234-job1", "job1_safe", "123", "bucket1", self.config)
+        job = job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         job.has_test_failures = True
         with self.assertRaises(SystemExit) as rc:
             Report(self.config, job)
@@ -38,7 +66,14 @@ def test_report_initialization_with_job_rehearsal_flag_true_test_failures(self):
 
     def test_report_initialization_with_job_rehearsal_flag_true_pod_failures(self):
         self.config.fail_with_pod_failures = True
-        job = Job("rehearse-1234-job1", "job1_safe", "123", "bucket1", self.config)
+        job = job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         job.has_pod_failures = True
         with self.assertRaises(SystemExit) as rc:
             Report(self.config, job)
diff --git a/tests/unittests/objects/job/test_fail_with_test_failures_should_not_cause_failure_for_ignored_step.py b/tests/unittests/objects/job/test_fail_with_test_failures_should_not_cause_failure_for_ignored_step.py
@@ -81,6 +81,7 @@ def job(firewatch_config):
         name_safe="amq-broker-interop-aws",
         build_id="1769607768542547968",
         gcs_bucket="test-platform-results",
+        gcs_creds_file=None,
         firewatch_config=firewatch_config,
     )
 
diff --git a/tests/unittests/objects/job/test_firewatch_objects_job.py b/tests/unittests/objects/job/test_firewatch_objects_job.py
@@ -4,7 +4,14 @@
 
 class TestJob(JobBaseTest):
     def test_initialization_with_valid_parameters(self):
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         self.assertEqual(job.name, "job1")
         self.assertEqual(job.name_safe, "job1_safe")
         self.assertEqual(job.build_id, "123")
diff --git a/tests/unittests/objects/job/test_firewatch_objects_job_check_is_rehearsal.py b/tests/unittests/objects/job/test_firewatch_objects_job_check_is_rehearsal.py
@@ -4,9 +4,23 @@
 
 class TestCheckIsRehearsal(JobBaseTest):
     def test_rehearsal_job_true(self):
-        job = Job("rehearse-1234-job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         self.assertTrue(job.is_rehearsal)
 
     def test_rehearsal_job_false(self):
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         self.assertFalse(job.is_rehearsal)
diff --git a/tests/unittests/objects/job/test_firewatch_objects_job_find_failures.py b/tests/unittests/objects/job/test_firewatch_objects_job_find_failures.py
@@ -10,7 +10,14 @@ def test_find_test_failures_no_pod_failures(self):
         temp_dir = tempfile.TemporaryDirectory()
         junit_dir = helpers._get_tmp_junit_dir(tmp_path=temp_dir.name)
         logs_dir = helpers._get_tmp_logs_dir(tmp_path=temp_dir.name)
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         helpers._create_failed_step_junit(junit_dir=junit_dir)
         failures = job._find_failures(
             junit_dir=junit_dir,
@@ -22,7 +29,14 @@ def test_find_pod_failures_no_test_failures(self):
         temp_dir = tempfile.TemporaryDirectory()
         junit_dir = helpers._get_tmp_junit_dir(tmp_path=temp_dir.name)
         logs_dir = helpers._get_tmp_logs_dir(tmp_path=temp_dir.name)
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         helpers._create_failed_step_pod(logs_dir=logs_dir)
         failures = job._find_failures(
             junit_dir=junit_dir,
@@ -34,7 +48,14 @@ def test_find_all_failures(self):
         temp_dir = tempfile.TemporaryDirectory()
         junit_dir = helpers._get_tmp_junit_dir(tmp_path=temp_dir.name)
         logs_dir = helpers._get_tmp_logs_dir(tmp_path=temp_dir.name)
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         helpers._create_failed_step_pod(logs_dir=logs_dir)
         helpers._create_failed_step_junit(junit_dir=junit_dir)
         failures = job._find_failures(
@@ -47,7 +68,14 @@ def test_failures_no_failures(self):
         temp_dir = tempfile.TemporaryDirectory()
         junit_dir = helpers._get_tmp_junit_dir(tmp_path=temp_dir.name)
         logs_dir = helpers._get_tmp_logs_dir(tmp_path=temp_dir.name)
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         helpers._create_successful_step_pod(logs_dir=logs_dir)
         helpers._create_successful_step_junit(junit_dir=junit_dir)
         failures = job._find_failures(
diff --git a/tests/unittests/objects/job/test_firewatch_objects_job_find_pod_failures.py b/tests/unittests/objects/job/test_firewatch_objects_job_find_pod_failures.py
@@ -9,15 +9,29 @@ class TestFindPodFailures(JobBaseTest):
     def test_find_pod_failures_with_failures(self):
         temp_dir = tempfile.TemporaryDirectory()
         logs_dir = helpers._get_tmp_logs_dir(tmp_path=temp_dir.name)
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         helpers._create_failed_step_pod(logs_dir=logs_dir)
         pod_failures = job._find_pod_failures(logs_dir=logs_dir)
         assert len(pod_failures) == 1
 
     def test_find_pod_failures_without_failures(self):
         temp_dir = tempfile.TemporaryDirectory()
         logs_dir = helpers._get_tmp_logs_dir(tmp_path=temp_dir.name)
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         helpers._create_successful_step_pod(logs_dir=logs_dir)
         pod_failures = job._find_pod_failures(logs_dir=logs_dir)
         assert len(pod_failures) == 0
diff --git a/tests/unittests/objects/job/test_firewatch_objects_job_find_test_failures.py b/tests/unittests/objects/job/test_firewatch_objects_job_find_test_failures.py
@@ -9,15 +9,29 @@ class TestFindTestFailures(JobBaseTest):
     def test_find_test_failures_with_failures(self):
         temp_dir = tempfile.TemporaryDirectory()
         junit_dir = helpers._get_tmp_junit_dir(tmp_path=temp_dir.name)
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         helpers._create_failed_step_junit(junit_dir=junit_dir)
         failures = job._find_test_failures(junit_dir=junit_dir)
         assert len(failures) == 1
 
     def test_find_test_failures_without_failures(self):
         temp_dir = tempfile.TemporaryDirectory()
         junit_dir = helpers._get_tmp_junit_dir(tmp_path=temp_dir.name)
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         helpers._create_successful_step_junit(junit_dir=junit_dir)
         failures = job._find_test_failures(junit_dir=junit_dir)
         assert len(failures) == 0
diff --git a/tests/unittests/objects/job/test_firewatch_objects_job_get_download_path.py b/tests/unittests/objects/job/test_firewatch_objects_job_get_download_path.py
@@ -11,13 +11,27 @@ class TestGetDownloadPath(JobBaseTest):
     mock_mkdir.start()
 
     def test_get_download_path_not_exists(self):
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         self.mock_exists.return_value = False
         path = job._get_download_path("123")
         self.assertEqual(path, "/tmp/123")
 
     def test_get_download_path_exists(self):
-        job = Job("job1", "job1_safe", "123", "bucket1", self.config)
+        job = Job(
+            name="rehearse-1234-job1",
+            name_safe="job1_safe",
+            build_id="123",
+            gcs_bucket="bucket1",
+            gcs_creds_file=None,
+            firewatch_config=self.config,
+        )
         self.mock_exists.return_value = True
         path = job._get_download_path("123")
         self.assertEqual(path, "/tmp/123")

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,7 @@ def job(firewatch_config, build_id):`
`221`	`221`	`name_safe="openshift-pipelines-interop-aws",`
`222`	`222`	`build_id=build_id,`
`223`	`223`	`gcs_bucket="test-platform-results",`
	`224`	`+ gcs_creds_file=None,`
`224`	`225`	`firewatch_config=firewatch_config,`
`225`	`226`	`)`
`226`	`227`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ def job(firewatch_config):`
`81`	`81`	`name_safe="amq-broker-interop-aws",`
`82`	`82`	`build_id="1769607768542547968",`
`83`	`83`	`gcs_bucket="test-platform-results",`
	`84`	`+ gcs_creds_file=None,`
`84`	`85`	`firewatch_config=firewatch_config,`
`85`	`86`	`)`
`86`	`87`