arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 09:18:08 +00:00
Code Issues Releases Wiki Activity

Ensure in test we didn't load the local configuration

Browse Source
This commit is contained in:
Julien Duponchelle 2015-06-09 16:25:36 +02:00
parent 36d5049c61
commit bd4b6396a8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/config.py
View File

@ -45,7 +45,9 @@ class Config(object):
# Monitor configuration files for changes
self._watched_files = {}
if sys.platform.startswith("win"):
if hasattr(sys, "_called_from_test"):
self._files = files
elif sys.platform.startswith("win"):
appname = "GNS3"
@ -87,6 +89,8 @@ class Config(object):
os.path.join("/etc/xdg", appname + ".conf"),
filename]
if self._files is None:
self._files = []
self.clear()
self._watch_config_file()