From: Norbert Lange <nolange79@gmail.com>
To: buildroot@buildroot.org
Cc: Norbert Lange <nolange79@gmail.com>,
"Yann E. MORIN" <yann.morin.1998@free.fr>
Subject: [Buildroot] [PATCH v6 4/4] support/run-test: add test for systemd using dbus-broker
Date: Sun, 9 Jan 2022 23:16:50 +0100 [thread overview]
Message-ID: <20220109221650.777610-4-nolange79@gmail.com> (raw)
In-Reply-To: <20220109221650.777610-1-nolange79@gmail.com>
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Add four new tests for systemd (rw and ro in each case):
- use dbus-broker instead of the original dbus
- use the original dbus, with dbus-broker installed
The first two extend the existing IfUpDown test cases by just enabling
dbus-broker; the second ones extend this further, by explicitly enabling
the original dbus.
For one of the tests, we overload the test_run() function to test that
the dbus-broker daemon is indeed running as root. We need not replicate
that check in the other dbus-broker-only test, and it does not make
sense to test that in tests that have the original dbus enabled.
Presence of the original dbus and dbus-broker on the same system is
valid: the original dbus is used as the default system bus daemon. We do
not test switching between the two at runtime, though as this is really
too corner-case specific. We just test to ensure the original dbus
system bus daemon is not impacted by the presence of dbus-broker.
Note: the 'full' test-case enables all systemd options, and some of them
do pull the original dbus package, so we can't use that to test the
integration of dbus-broker; instead, we extend the ifupdown case, which
does not enable the original dbus.
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Norbert Lange <nolange79@gmail.com>
---
support/testing/tests/init/test_systemd.py | 37 ++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py
index 80c6776f59..80d172e5e2 100644
--- a/support/testing/tests/init/test_systemd.py
+++ b/support/testing/tests/init/test_systemd.py
@@ -83,6 +83,29 @@ class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase):
self.check_systemd("squashfs")
+class TestInitSystemSystemdRoIfupdownDbusbroker(TestInitSystemSystemdRoIfupdown):
+ config = TestInitSystemSystemdRoIfupdown.config + \
+ """
+ BR2_PACKAGE_DBUS_BROKER=y
+ """
+
+ def test_run(self):
+ # Parent class' test_run() method does exactly that, no more:
+ self.check_systemd("squashfs")
+
+ # Check that the dbus-broker daemon is running as non-root
+ cmd = "find /proc/$(pidof dbus-broker) -maxdepth 1 -name exe -user dbus"
+ out, _ = self.emulator.run(cmd)
+ self.assertEqual(len(out), 1)
+
+
+class TestInitSystemSystemdRoIfupdownDbusbrokerDbus(TestInitSystemSystemdRoIfupdownDbusbroker):
+ config = TestInitSystemSystemdRoIfupdownDbusbroker.config + \
+ """
+ BR2_PACKAGE_DBUS=y
+ """
+
+
class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase):
config = InitSystemSystemdBase.config + \
"""
@@ -95,6 +118,20 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase):
self.check_systemd("ext2")
+class TestInitSystemSystemdRwIfupdownDbusbroker(TestInitSystemSystemdRwIfupdown):
+ config = TestInitSystemSystemdRwIfupdown.config + \
+ """
+ BR2_PACKAGE_DBUS_BROKER=y
+ """
+
+
+class TestInitSystemSystemdRwIfupdownDbusbrokerDbus(TestInitSystemSystemdRwIfupdownDbusbroker):
+ config = TestInitSystemSystemdRwIfupdownDbusbroker.config + \
+ """
+ BR2_PACKAGE_DBUS=y
+ """
+
+
class TestInitSystemSystemdRoFull(InitSystemSystemdBase):
config = InitSystemSystemdBase.config + \
"""
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2022-01-09 22:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-09 22:16 [Buildroot] [PATCH v6 1/4] package/dbus-broker: new package Norbert Lange
2022-01-09 22:16 ` [Buildroot] [PATCH v6 2/4] package/systemd: do not force dbus if dbus-broker is available Norbert Lange
2022-01-09 22:16 ` [Buildroot] [PATCH v6 3/4] support/testsuite: de-duplicate the systemd runtime tests Norbert Lange
2022-07-27 15:04 ` Arnout Vandecappelle
2022-01-09 22:16 ` Norbert Lange [this message]
2022-07-27 10:56 ` [Buildroot] [PATCH v6 1/4] package/dbus-broker: new package Arnout Vandecappelle
2022-07-27 13:47 ` Norbert Lange
2022-07-27 17:05 ` Arnout Vandecappelle
2022-07-27 17:31 ` Norbert Lange
2022-07-27 19:09 ` Arnout Vandecappelle
2022-07-27 19:24 ` Norbert Lange
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220109221650.777610-4-nolange79@gmail.com \
--to=nolange79@gmail.com \
--cc=buildroot@buildroot.org \
--cc=yann.morin.1998@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox