Run tests just on the session bus

Avoid the system bus, since otherwise needs roots permissions, and is more cumbersome to setup
Cogitri · Oct 2, 2023 · bd80c9a · bd80c9a
1 parent 15425a1
commit bd80c9a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml
@@ -46,7 +46,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Build and test plugin
-        run: docker run --mount type=bind,src=${{ github.workspace }},dst=/repo --rm ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}:${{ env.VERSION}} /bin/ash -c "cd repo && meson build && ninja -C build && dbus-daemon --system --fork --nopidfile && dbus-run-session -- meson test -v -C build"
+        run: docker run --mount type=bind,src=${{ github.workspace }},dst=/repo --rm ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}:${{ env.VERSION}} /bin/ash -c "cd repo && meson build && ninja -C build && dbus-run-session -- meson test -v -C build"
 
       - name: Push Docker image
         if: github.event_name == 'push'

diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml
@@ -22,4 +22,4 @@ jobs:
         run: meson build && ninja -C build
 
       - name: Test
-        run: dbus-daemon --system --fork --nopidfile && dbus-run-session -- meson test -v -C build
+        run: dbus-run-session -- meson test -v -C build
diff --git a/src/gs-plugin-apk/gs-plugin-apk.c b/src/gs-plugin-apk/gs-plugin-apk.c
@@ -214,13 +214,16 @@ gs_plugin_apk_setup_async (GsPlugin *plugin,
                            gpointer user_data)
 {
   g_autoptr (GTask) task = NULL;
+  GBusType bus_type = G_BUS_TYPE_SYSTEM;
 
   task = g_task_new (plugin, cancellable, callback, user_data);
   g_task_set_source_tag (task, gs_plugin_apk_setup_async);
 
   g_debug ("Initializing plugin");
 
-  apk_polkit2_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+  if (g_getenv ("G_TEST_SRCDIR"))
+    bus_type = G_BUS_TYPE_SESSION;
+  apk_polkit2_proxy_new_for_bus (bus_type,
                                  G_DBUS_PROXY_FLAGS_NONE,
                                  "dev.Cogitri.apkPolkit2",
                                  "/dev/Cogitri/apkPolkit2",

diff --git a/tests/apkpolkit2.py b/tests/apkpolkit2.py
@@ -18,7 +18,7 @@
 BUS_NAME   = 'dev.Cogitri.apkPolkit2'
 MAIN_OBJ   = '/dev/Cogitri/apkPolkit2'
 MAIN_IFACE = 'dev.Cogitri.apkPolkit2'
-SYSTEM_BUS = True
+SYSTEM_BUS = False
 
 def load(mock, parameters):
     repos = [

diff --git a/tests/test.py b/tests/test.py
@@ -27,6 +27,9 @@ def setUp(self):
     def tearDown(self):
         if self.log is not None:
             self.log.close()
+        if self.p_mock:
+            self.p_mock.terminate()
+            self.p_mock.wait()
 
     def test_apk(self):
         builddir = os.getenv('G_TEST_BUILDDIR')