From 11e165073eb3bd21d764fa1c4d71f1e6a52eae1b Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Tue, 30 Dec 2008 03:11:45 -0700 Subject: Docstring cleanup in the Env bootstraping methods --- tests/test_ipalib/test_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test_ipalib/test_config.py') 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: -- cgit