[gnome-software: 1/2] tests: Skip parental controls in flatpak
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software: 1/2] tests: Skip parental controls in flatpak
- Date: Sun, 5 Dec 2021 18:04:46 +0000 (UTC)
commit 1c0de2e3aabdee75332f6182db7e3695beff2a0a
Author: Dan Nicholson <dbn endlessos org>
Date: Fri Dec 3 10:42:40 2021 -0700
tests: Skip parental controls in flatpak
If the flatpak in the test environment is built with parental controls
support, the tests will fail when the dbus system bus isn't available.
Set the `FLATPAK_SYSTEM_HELPER_ON_SESSION` environment variable so
flatpak skips parental controls. This is the same thing flatpak's test
suite does in lieu of proper malcontent mocking or some non-dbus method
of being disabled.
meson.build | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/meson.build b/meson.build
index 399b84b08..9098324ad 100644
--- a/meson.build
+++ b/meson.build
@@ -289,6 +289,10 @@ test_env = [
'GSETTINGS_SCHEMA_DIR=@0@/data/'.format(meson.build_root()),
'GSETTINGS_BACKEND=memory',
'MALLOC_CHECK_=2',
+
+ # Make flatpak skip parental controls since it requires the system bus.
+ # https://github.com/flatpak/flatpak/issues/2993
+ 'FLATPAK_SYSTEM_HELPER_ON_SESSION=1',
]
subdir('data')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]