diff options
| author | Benjamin Berg <bberg@redhat.com> | 2018-03-15 18:15:05 +0100 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2018-04-10 20:09:32 +0200 |
| commit | b2140cc522a984a4e06db4c8ac97ab85bc9f3a98 (patch) | |
| tree | 57fc214ae7d8fd6f21e723b5a3e51a7c9e9cc6a4 /tests | |
| parent | 0ab5e2f1e7dae2536f06c2b48459bc870440c50a (diff) | |
| download | gnome-settings-daemon-b2140cc522a984a4e06db4c8ac97ab85bc9f3a98.tar.gz | |
tests: Signal mutter and gnome-session that we are using X11
Moving this is important, as gnome-session (or to be exact the
acceleration check) requires the environment variable to be set already.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gsdtestcase.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/gsdtestcase.py b/tests/gsdtestcase.py index 389c53d7..6b6b06a6 100644 --- a/tests/gsdtestcase.py +++ b/tests/gsdtestcase.py @@ -59,6 +59,9 @@ class GSDTestCase(dbusmock.DBusTestCase): os.environ['LC_MESSAGES'] = 'C' klass.workdir = tempfile.mkdtemp(prefix='gsd-plugin-test') + # Signal to mutter and gnome-session that we are using X11 + os.environ['XDG_SESSION_TYPE'] = 'x11' + klass.start_xorg() # tell dconf and friends to use our config/runtime directories @@ -171,7 +174,6 @@ class GSDTestCase(dbusmock.DBusTestCase): klass.mutter_log = open(os.path.join(klass.workdir, 'mutter.log'), 'wb') # See https://gitlab.gnome.org/GNOME/mutter/merge_requests/15 - os.environ['XDG_SESSION_TYPE'] = 'x11' klass.mutter = subprocess.Popen(['mutter', '--x11'], stdout=klass.mutter_log, stderr=subprocess.STDOUT) |