summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Playfair Cal <daniel.playfair.cal@gmail.com>2019-02-26 09:02:28 +0000
committerDaniel Playfair Cal <daniel.playfair.cal@gmail.com>2019-02-26 09:02:28 +0000
commit4b7baeac7a85dbc4eac9fa750c3c24bd91ecab7a (patch)
tree781286e3ff8d6d2474ba212d7b137901fa0caba3
parentb62ce371159be9f518657ec907b668d91287e7c8 (diff)
parent429634f125819cfdcd0dfab0e5254fc7b687b7a6 (diff)
downloaddconf-4b7baeac7a85dbc4eac9fa750c3c24bd91ecab7a.tar.gz
Merge branch 'env' into 'master'
tests: Avoid using real system bus during tests See merge request GNOME/dconf!45
-rwxr-xr-xtests/test-dconf.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-dconf.py b/tests/test-dconf.py
index cf9bb14..6cd80a8 100755
--- a/tests/test-dconf.py
+++ b/tests/test-dconf.py
@@ -802,8 +802,8 @@ if __name__ == '__main__':
os.environ.pop('DCONF_PROFILE', None)
os.environ.pop('XDG_DATA_DIRS', None)
# Avoid interfering with external message buses.
- os.environ.pop('DBUS_SYSTEM_BUS_ADDRESS', None)
- os.environ.pop('DBUS_SESSION_BUS_ADDRESS', None)
+ os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = ''
+ os.environ['DBUS_SESSION_BUS_ADDRESS'] = ''
if len(sys.argv) < 3:
message = 'Usage: {} path-to-dconf path-to-dconf-service'.format(