From 6c5fbf652319215e4cd76e2bc7d7dd262df7404a Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Fri, 16 Feb 2024 17:37:08 -0500 Subject: [PATCH] tests: Patch apps_init for enable/disable daemon test Otherwise, apps_init calls _sort_apps, which randomly fails in functional tests CI job. The failure may be due to the tests running in parallel, since I could not reproduce it locally. Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- plinth/tests/test_daemon.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plinth/tests/test_daemon.py b/plinth/tests/test_daemon.py index fd745e8ca..7051d6fe3 100644 --- a/plinth/tests/test_daemon.py +++ b/plinth/tests/test_daemon.py @@ -77,10 +77,11 @@ def test_is_enabled(service_is_enabled, daemon): service_is_enabled.assert_has_calls([call('test-unit', strict_check=True)]) +@patch('plinth.app.apps_init') @patch('subprocess.run') @patch('subprocess.call') -def test_enable(subprocess_call, subprocess_run, app_list, mock_privileged, - daemon): +def test_enable(subprocess_call, subprocess_run, apps_init, app_list, + mock_privileged, daemon): """Test that enabling the daemon works.""" daemon.enable() subprocess_call.assert_has_calls( @@ -101,9 +102,11 @@ def test_enable(subprocess_call, subprocess_run, app_list, mock_privileged, stdout=subprocess.DEVNULL, check=False) +@patch('plinth.app.apps_init') @patch('subprocess.run') @patch('subprocess.call') -def test_disable(subprocess_call, subprocess_run, mock_privileged, daemon): +def test_disable(subprocess_call, subprocess_run, apps_init, app_list, + mock_privileged, daemon): """Test that disabling the daemon works.""" daemon.disable() subprocess_call.assert_has_calls(