From 0893b94840c46d46ee55ca3fd99a882208b77d8a Mon Sep 17 00:00:00 2001 From: mprahl Date: Nov 20 2018 18:39:22 +0000 Subject: Capitalize the first letter of the summary for a passing gating decision --- diff --git a/functional-tests/consumers/test_resultsdb.py b/functional-tests/consumers/test_resultsdb.py index 7c562ed..301af6d 100644 --- a/functional-tests/consumers/test_resultsdb.py +++ b/functional-tests/consumers/test_resultsdb.py @@ -128,7 +128,7 @@ def test_consume_new_result( }, ], 'unsatisfied_requirements': [], - 'summary': 'all required tests passed', + 'summary': 'All required tests passed', 'subject': [ {'item': nvr, 'type': 'koji_build'}, ], @@ -529,7 +529,7 @@ def test_consume_legacy_result( 'type': 'test-result-passed' }], 'unsatisfied_requirements': [], - 'summary': 'all required tests passed', + 'summary': 'All required tests passed', 'subject': [ { 'item': nvr, diff --git a/functional-tests/consumers/test_waiverdb.py b/functional-tests/consumers/test_waiverdb.py index ffcf61b..86dd58e 100644 --- a/functional-tests/consumers/test_waiverdb.py +++ b/functional-tests/consumers/test_waiverdb.py @@ -111,6 +111,6 @@ def test_consume_new_waiver( } ], 'unsatisfied_requirements': [], - 'summary': 'all required tests passed', + 'summary': 'All required tests passed', 'testcase': testcase, } diff --git a/functional-tests/test_api_v1.py b/functional-tests/test_api_v1.py index 1235036..688a5be 100644 --- a/functional-tests/test_api_v1.py +++ b/functional-tests/test_api_v1.py @@ -239,7 +239,7 @@ def test_make_a_decision_on_passed_result(requests_session, greenwave_server, te 'taskotron_release_critical_tasks_with_blacklist', 'taskotron_release_critical_tasks', ] - expected_summary = 'all required tests passed' + expected_summary = 'All required tests passed' assert res_data['summary'] == expected_summary @@ -373,7 +373,7 @@ def test_make_a_decision_on_failed_result_with_waiver( assert res_data['policies_satisfied'] is True assert 'taskotron_release_critical_tasks' in res_data['applicable_policies'] assert 'taskotron_release_critical_tasks_with_blacklist' in res_data['applicable_policies'] - expected_summary = 'all required tests passed' + expected_summary = 'All required tests passed' assert res_data['summary'] == expected_summary @@ -577,7 +577,7 @@ def test_bodhi_push_update_stable_policy( assert res_data['policies_satisfied'] is True assert 'taskotron_release_critical_tasks' in res_data['applicable_policies'] assert 'taskotron_release_critical_tasks_with_blacklist' in res_data['applicable_policies'] - expected_summary = 'all required tests passed' + expected_summary = 'All required tests passed' assert res_data['summary'] == expected_summary assert res_data['unsatisfied_requirements'] == [] @@ -728,7 +728,7 @@ def test_make_a_decision_on_passed_result_with_scenario( res_data = r.json() assert res_data['policies_satisfied'] is True assert res_data['applicable_policies'] == ['openqa_important_stuff_for_rawhide'] - expected_summary = 'all required tests passed' + expected_summary = 'All required tests passed' assert res_data['summary'] == expected_summary @@ -926,7 +926,7 @@ def test_make_a_decision_about_brew_build(requests_session, greenwave_server, te res_data = r.json() assert res_data['policies_satisfied'] is True assert res_data['applicable_policies'] == ['osci_compose'] - assert res_data['summary'] == 'all required tests passed' + assert res_data['summary'] == 'All required tests passed' def test_validate_gating_yaml_valid(requests_session, greenwave_server): diff --git a/greenwave/policies.py b/greenwave/policies.py index 65a6abf..f5be60f 100644 --- a/greenwave/policies.py +++ b/greenwave/policies.py @@ -252,7 +252,7 @@ def summarize_answers(answers): return '{} of {} required test results missing'.format(missing_count, len(answers)) if all(answer.is_satisfied for answer in answers): - return 'all required tests passed' + return 'All required tests passed' assert False, 'Unexpected unsatisfied result' return 'inexplicable result' diff --git a/greenwave/tests/test_policies.py b/greenwave/tests/test_policies.py index 64cad42..f34b827 100644 --- a/greenwave/tests/test_policies.py +++ b/greenwave/tests/test_policies.py @@ -54,7 +54,7 @@ class DummyResultsRetriever(ResultsRetriever): def test_summarize_answers(): assert summarize_answers([RuleSatisfied()]) == \ - 'all required tests passed' + 'All required tests passed' assert summarize_answers([TestResultFailed('koji_build', 'nvr', 'test', None, 'id'), RuleSatisfied()]) == \ '1 of 2 required tests failed' diff --git a/greenwave/tests/test_summary.py b/greenwave/tests/test_summary.py index 2543770..199d311 100644 --- a/greenwave/tests/test_summary.py +++ b/greenwave/tests/test_summary.py @@ -24,7 +24,7 @@ def test_summary_passed(): answers = [ testResultPassed, ] - assert summarize_answers(answers) == 'all required tests passed' + assert summarize_answers(answers) == 'All required tests passed' def test_summary_empty(): @@ -50,7 +50,7 @@ def test_summary_missing_waived(): answers = [ testResultMissingWaived, ] - assert summarize_answers(answers) == 'all required tests passed' + assert summarize_answers(answers) == 'All required tests passed' def test_summary_one_passed_one_failed(): @@ -74,7 +74,7 @@ def test_summary_one_passed_one_missing_waived(): testResultPassed, testResultMissingWaived, ] - assert summarize_answers(answers) == 'all required tests passed' + assert summarize_answers(answers) == 'All required tests passed' def test_summary_one_failed_one_missing():