diff options
| author | Benjamin Berg <bberg@redhat.com> | 2020-11-25 18:11:31 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2021-01-11 13:39:39 +0000 |
| commit | cdd42298d6c154f71fdb0a294b117877a4965551 (patch) | |
| tree | 9da0ab792942aeb6ae77191d51d60fb5c2477c13 /tests | |
| parent | 70cadb750353c398198a6c84e5d78551ebe48851 (diff) | |
| download | gnome-settings-daemon-cdd42298d6c154f71fdb0a294b117877a4965551.tar.gz | |
tests: Unset display environment variables
The environment variables were not correctly cleared. Fix this and also
make sure that we don't have the GNOME_SETUP_DISPLAY environment
variable leaking in from the outside.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/x11session.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/x11session.py b/tests/x11session.py index ff2d389c..7fb0b834 100644 --- a/tests/x11session.py +++ b/tests/x11session.py @@ -94,7 +94,10 @@ class X11SessionTestCase(DBusTestCase): klass.X_display = display # Export information into our environment for tests to use os.environ['DISPLAY'] = ":%d" % klass.X_display - os.environ['WAYLAND'] = '' + if 'GNOME_SETUP_DISPLAY' in os.environ: + del os.environ['GNOME_SETUP_DISPLAY'] + if 'WAYLAND_DISPLAY' in os.environ: + del os.environ['WAYLAND_DISPLAY'] # Server should still be up and running at this point assert klass.xorg.poll() is None |