From f1059804767bc733f35e5d97db84658e84b4cafa Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 30 Oct 2023 15:44:17 -0700 Subject: [PATCH] apache: tests: Update to use DiagnosticCheck class Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/apache/tests/test_components.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plinth/modules/apache/tests/test_components.py b/plinth/modules/apache/tests/test_components.py index 119de8c9e..4c575ad2b 100644 --- a/plinth/modules/apache/tests/test_components.py +++ b/plinth/modules/apache/tests/test_components.py @@ -73,18 +73,22 @@ def test_webserver_diagnose(diagnose_url_on_all, diagnose_url): """Test running diagnostics.""" def on_all_side_effect(url, check_certificate, expect_redirects): - return [('test-result-' + url, 'success')] + return [ + DiagnosticCheck('test-all-id', 'test-result-' + url, 'success') + ] def side_effect(url, check_certificate): - return ('test-result-' + url, 'success') + return DiagnosticCheck('test-id', 'test-result-' + url, 'success') diagnose_url_on_all.side_effect = on_all_side_effect diagnose_url.side_effect = side_effect webserver1 = Webserver('test-webserver', 'test-config', urls=['{host}url1', 'url2'], expect_redirects=True) results = webserver1.diagnose() - assert results == [('test-result-{host}url1', 'success'), - ('test-result-url2', 'success')] + assert results == [ + DiagnosticCheck('test-all-id', 'test-result-{host}url1', 'success'), + DiagnosticCheck('test-id', 'test-result-url2', 'success') + ] diagnose_url_on_all.assert_has_calls( [call('{host}url1', check_certificate=False, expect_redirects=True)]) diagnose_url.assert_has_calls([call('url2', check_certificate=False)])