summaryrefslogtreecommitdiffstats
path: root/tests/test_ipalib/test_config.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_ipalib/test_config.py')
-rw-r--r--tests/test_ipalib/test_config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_ipalib/test_config.py b/tests/test_ipalib/test_config.py
index 7c53efe2..6737b086 100644
--- a/tests/test_ipalib/test_config.py
+++ b/tests/test_ipalib/test_config.py
@@ -510,7 +510,7 @@ class test_Env(ClassChecker):
# Test an empty config file
empty = tmp.touch('empty.conf')
assert path.isfile(empty)
- assert o._merge_from_file(empty) is None
+ assert o._merge_from_file(empty) == (0, 0)
assert tuple(o) == keys
# Test a mal-formed config file: