From c4772ecef6c44ade30f4befb38e32d6dc293aad3 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 14 Oct 2024 12:21:21 +0200 Subject: [PATCH] support/testing/tests/package/test_mender.py: Add a systemd test - Move the check for /var/run/mender.pid to before self.run_mender_test() for the two tests using sysvinit. - Instead of checking for /var/run/mender.pid during the systemd test, check to ensure "systemctl is-active mender-client" returns "active" Signed-off-by: Adam Duskett [Arnout: fix flake8 issue] Signed-off-by: Arnout Vandecappelle --- support/testing/tests/package/test_mender.py | 22 ++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/package/test_mender.py b/support/testing/tests/package/test_mender.py index 0938cb77e1..976d03b172 100644 --- a/support/testing/tests/package/test_mender.py +++ b/support/testing/tests/package/test_mender.py @@ -20,8 +20,6 @@ class TestMenderInfra(infra.basetest.BRTest): self.emulator.login() def run_mender_test(self): - # Check if the Daemon is running - self.assertRunOk("ls /var/run/mender.pid") self.assertRunOk("ps aux | egrep [m]ender") # Check if a simple Mender command is correctly executed @@ -35,6 +33,9 @@ class TestMenderInfra(infra.basetest.BRTest): class TestMenderRW(TestMenderInfra): def test_run(self): TestMenderInfra.base_test_run(self) + + # Check if the Daemon is running + self.assertRunOk("ls /var/run/mender.pid") self.run_mender_test() @@ -47,4 +48,21 @@ class TestMenderRO(TestMenderInfra): def test_run(self): TestMenderInfra.base_test_run(self) + + # Check if the Daemon is running + self.assertRunOk("ls /var/run/mender.pid") + self.run_mender_test() + + +class TestMenderSystemd(TestMenderInfra): + config = \ + """ + {} + BR2_INIT_SYSTEMD=y + """.format(TestMenderInfra.config) + + def test_run(self): + TestMenderInfra.base_test_run(self) + output, _ = self.emulator.run("systemctl is-active mender-client") + self.assertEqual(output[0], "active") self.run_mender_test()