nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-29 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

apache: tests: Update to use DiagnosticCheck class

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2023-10-30 15:44:17 -07:00 committed by James Valleroy
parent e3c2546b79
commit f105980476
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plinth/modules/apache/tests/test_components.py
View File

@ -73,18 +73,22 @@ def test_webserver_diagnose(diagnose_url_on_all, diagnose_url):
"""Test running diagnostics.""" """Test running diagnostics."""
def on_all_side_effect(url, check_certificate, expect_redirects): 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): 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_on_all.side_effect = on_all_side_effect
diagnose_url.side_effect = side_effect diagnose_url.side_effect = side_effect
webserver1 = Webserver('test-webserver', 'test-config', webserver1 = Webserver('test-webserver', 'test-config',
urls=['{host}url1', 'url2'], expect_redirects=True) urls=['{host}url1', 'url2'], expect_redirects=True)
results = webserver1.diagnose() results = webserver1.diagnose()
assert results == [('test-result-{host}url1', 'success'), assert results == [
('test-result-url2', 'success')] DiagnosticCheck('test-all-id', 'test-result-{host}url1', 'success'),
DiagnosticCheck('test-id', 'test-result-url2', 'success')
]
diagnose_url_on_all.assert_has_calls( diagnose_url_on_all.assert_has_calls(
[call('{host}url1', check_certificate=False, expect_redirects=True)]) [call('{host}url1', check_certificate=False, expect_redirects=True)])
diagnose_url.assert_has_calls([call('url2', check_certificate=False)]) diagnose_url.assert_has_calls([call('url2', check_certificate=False)])