[gnome-settings-daemon/benzea/test-display-env] tests: Unset display environment variables
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/benzea/test-display-env] tests: Unset display environment variables
- Date: Wed, 25 Nov 2020 17:13:46 +0000 (UTC)
commit 311ead61f4a7ec7495e3f54c569e09a93700e59d
Author: Benjamin Berg <bberg redhat com>
Date: Wed Nov 25 18:11:31 2020 +0100
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.
tests/x11session.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/tests/x11session.py b/tests/x11session.py
index ff2d389c..4c77cc00 100644
--- a/tests/x11session.py
+++ b/tests/x11session.py
@@ -94,7 +94,8 @@ 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'] = ''
+ del os.environ['GNOME_SETUP_DISPLAY']
+ del os.environ['WAYLAND_DISPLAY']
# Server should still be up and running at this point
assert klass.xorg.poll() is None
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]