diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-22 16:05:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-22 16:05:21 +0000 |
| commit | cd984ec53ca3b6b4ae12cfbf1be14c4dea98b662 (patch) | |
| tree | 31693c750179c02e1d1af0a2971fd704bcb20f28 /tests | |
| parent | cd07f45d8cdf1a7538ed1343ada4f8b3e03e4d57 (diff) | |
| parent | feb032d9b50fee81420e7ab0340daad360386c01 (diff) | |
| download | zuul-cd984ec53ca3b6b4ae12cfbf1be14c4dea98b662.tar.gz | |
Merge "Hide skipped jobs in status/reports"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/test_scheduler.py | 5 | ||||
| -rw-r--r-- | tests/unit/test_v3.py | 18 |
2 files changed, 10 insertions, 13 deletions
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py index eb5ee826f..d4fa98d1e 100644 --- a/tests/unit/test_scheduler.py +++ b/tests/unit/test_scheduler.py @@ -5731,8 +5731,7 @@ For CI problems and help debugging, contact ci@example.org""" self.assertEqual(A.reported, 2) self.assertTrue(re.search('project-merge .* NODE_FAILURE', A.messages[1])) - self.assertTrue(re.search('project-test1 .* SKIPPED', A.messages[1])) - self.assertTrue(re.search('project-test2 .* SKIPPED', A.messages[1])) + self.assertTrue('Skipped 2 jobs' in A.messages[1]) def test_nodepool_resources(self): "Test that resources are reported" @@ -6854,7 +6853,7 @@ class TestDependencyGraph(ZuulTestCase): self.assertHistory([ dict(name='build', result='FAILURE', changes='1,1'), ], ordered=False) - self.assertIn('SKIPPED', A.messages[0]) + self.assertIn('Skipped 1 job', A.messages[0]) class TestDuplicatePipeline(ZuulTestCase): diff --git a/tests/unit/test_v3.py b/tests/unit/test_v3.py index 9fd8ea1d3..a89bb3007 100644 --- a/tests/unit/test_v3.py +++ b/tests/unit/test_v3.py @@ -4930,7 +4930,7 @@ class TestDataReturn(AnsibleZuulTestCase): self.assertIn( '- data-return https://zuul.example.com/', A.messages[-1]) - self.assertTrue(re.search('child .* SKIPPED', A.messages[-1])) + self.assertTrue('Skipped 1 job' in A.messages[-1]) self.assertIn('Build succeeded', A.messages[-1]) def test_data_return_invalid_child_job(self): @@ -4943,7 +4943,7 @@ class TestDataReturn(AnsibleZuulTestCase): self.assertIn( '- data-return-invalid-child-job https://zuul.example.com', A.messages[-1]) - self.assertTrue(re.search('data-return .* SKIPPED', A.messages[-1])) + self.assertTrue('Skipped 1 job' in A.messages[-1]) self.assertIn('Build succeeded', A.messages[-1]) def test_data_return_skip_all_child_jobs(self): @@ -4957,8 +4957,7 @@ class TestDataReturn(AnsibleZuulTestCase): self.assertIn( '- data-return-skip-all https://zuul.example.com/', A.messages[-1]) - self.assertTrue(re.search('child .* SKIPPED', A.messages[-1])) - self.assertTrue(re.search('data-return .* SKIPPED', A.messages[-1])) + self.assertTrue('Skipped 2 jobs' in A.messages[-1]) self.assertIn('Build succeeded', A.messages[-1]) def test_data_return_skip_all_child_jobs_with_soft_dependencies(self): @@ -4972,8 +4971,7 @@ class TestDataReturn(AnsibleZuulTestCase): ]) self.assertIn('- data-return-cd https://zuul.example.com/', A.messages[-1]) - self.assertTrue(re.search('data-return-a .* SKIPPED', A.messages[-1])) - self.assertTrue(re.search('data-return-b .* SKIPPED', A.messages[-1])) + self.assertTrue('Skipped 2 jobs' in A.messages[-1]) self.assertIn('Build succeeded', A.messages[-1]) def test_several_zuul_return(self): @@ -4987,7 +4985,7 @@ class TestDataReturn(AnsibleZuulTestCase): self.assertIn( '- several-zuul-return-child https://zuul.example.com/', A.messages[-1]) - self.assertTrue(re.search('data-return .* SKIPPED', A.messages[-1])) + self.assertTrue('Skipped 1 job' in A.messages[-1]) self.assertIn('Build succeeded', A.messages[-1]) def test_data_return_skip_retry(self): @@ -6905,7 +6903,7 @@ class TestJobPause(AnsibleZuulTestCase): dict(name='compile', result='SUCCESS', changes='1,1'), ]) - self.assertTrue(re.search('test .* SKIPPED', A.messages[0])) + self.assertTrue('Skipped 1 job' in A.messages[0]) def test_job_pause_pre_skipped_child(self): """ @@ -6953,7 +6951,7 @@ class TestJobPause(AnsibleZuulTestCase): dict(name='compile', result='SUCCESS', changes='1,1'), ]) - self.assertTrue(re.search('test .* SKIPPED', A.messages[0])) + self.assertTrue('Skipped 1 job' in A.messages[0]) def test_job_pause_skipped_child_retry(self): """ @@ -7822,7 +7820,7 @@ class TestProvidesRequiresMysql(ZuulTestCase): dict(name='image-builder', result='FAILURE', changes='1,1'), dict(name='hold', result='SUCCESS', changes='1,1'), ], ordered=False) - self.assertTrue(re.search('image-user .* SKIPPED', A.messages[0])) + self.assertTrue('Skipped 1 job' in A.messages[0]) B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |