Only warn on conflict

Charcoal-SE · Aug 31, 2018 · 2e31083 · 2e31083
1 parent c41ff41
commit 2e31083
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/globalvars.py b/globalvars.py
@@ -117,7 +117,7 @@ class GlobalVars:
         log('debug', "Configuration loaded from \"config\"")
     else:
         config.read('config.ci')
-        if "pytest" in sys.modules:
+        if "pytest" in sys.modules and os.path.isfile('config'):  # Another config found while running in pytest
             log('debug', "Running in pytest, force load config from \"config.ci\"")
         else:
             log('debug', "Configuration loaded from \"config.ci\"")