|
 |
ac3a84 |
From a8a0c31123f7a8c1c317bb1a83548f15b02974d0 Mon Sep 17 00:00:00 2001
|
|
|
ac3a84 |
From: Frantisek Sumsal <fsumsal@redhat.com>
|
|
|
ac3a84 |
Date: Thu, 24 Nov 2022 15:23:12 +0100
|
|
|
8d419f |
Subject: [PATCH] test: don't test buses we don't ship
|
|
|
8d419f |
|
|
|
8d419f |
rhel-only
|
|
|
ac3a84 |
Related: #2138081
|
|
|
8d419f |
---
|
|
|
ac3a84 |
test/units/testsuite-21.sh | 18 ++----------------
|
|
|
ac3a84 |
1 file changed, 2 insertions(+), 16 deletions(-)
|
|
|
8d419f |
|
|
|
8d419f |
diff --git a/test/units/testsuite-21.sh b/test/units/testsuite-21.sh
|
|
|
ac3a84 |
index d931e63167..e7d97ae06e 100755
|
|
|
8d419f |
--- a/test/units/testsuite-21.sh
|
|
|
8d419f |
+++ b/test/units/testsuite-21.sh
|
|
|
ac3a84 |
@@ -27,13 +27,13 @@ systemctl log-level info
|
|
|
8d419f |
# TODO
|
|
|
8d419f |
# * check for possibly newly introduced buses?
|
|
|
8d419f |
BUS_LIST=(
|
|
|
8d419f |
- org.freedesktop.home1
|
|
|
8d419f |
+# org.freedesktop.home1
|
|
|
8d419f |
org.freedesktop.hostname1
|
|
|
8d419f |
org.freedesktop.import1
|
|
|
8d419f |
org.freedesktop.locale1
|
|
|
8d419f |
org.freedesktop.login1
|
|
|
8d419f |
org.freedesktop.machine1
|
|
|
8d419f |
- org.freedesktop.portable1
|
|
|
8d419f |
+# org.freedesktop.portable1
|
|
|
8d419f |
org.freedesktop.resolve1
|
|
|
8d419f |
org.freedesktop.systemd1
|
|
|
8d419f |
org.freedesktop.timedate1
|
|
|
ac3a84 |
@@ -46,20 +46,6 @@ if tail -n +1 /proc/pressure/{cpu,io,memory}; then
|
|
|
ac3a84 |
)
|
|
|
ac3a84 |
fi
|
|
|
8d419f |
|
|
|
ac3a84 |
-# Some services require specific conditions:
|
|
|
ac3a84 |
-# - systemd-timesyncd can't run in a container
|
|
|
ac3a84 |
-# - systemd-networkd can run in a container if it has CAP_NET_ADMIN capability
|
|
|
ac3a84 |
-if ! systemd-detect-virt --container; then
|
|
|
ac3a84 |
- BUS_LIST+=(
|
|
|
ac3a84 |
- org.freedesktop.network1
|
|
|
ac3a84 |
- org.freedesktop.timesync1
|
|
|
ac3a84 |
- )
|
|
|
ac3a84 |
-elif busctl introspect org.freedesktop.network1 / &>/dev/null; then
|
|
|
ac3a84 |
- BUS_LIST+=(
|
|
|
ac3a84 |
- org.freedesktop.network1
|
|
|
ac3a84 |
- )
|
|
|
ac3a84 |
-fi
|
|
|
ac3a84 |
-
|
|
|
ac3a84 |
SESSION_BUS_LIST=(
|
|
|
ac3a84 |
org.freedesktop.systemd1
|
|
|
ac3a84 |
)
|