diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-12-30 03:11:45 -0700 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-12-30 03:11:45 -0700 |
| commit | 11e165073eb3bd21d764fa1c4d71f1e6a52eae1b (patch) | |
| tree | ca8bf1af4ca5f0305510ebd876841def6a061133 /tests/test_ipalib/test_config.py | |
| parent | 7012bed29949dacc26459ab2b49b51a494faf42f (diff) | |
| download | freeipa-11e165073eb3bd21d764fa1c4d71f1e6a52eae1b.tar.gz freeipa-11e165073eb3bd21d764fa1c4d71f1e6a52eae1b.tar.xz freeipa-11e165073eb3bd21d764fa1c4d71f1e6a52eae1b.zip | |
Docstring cleanup in the Env bootstraping methods
Diffstat (limited to 'tests/test_ipalib/test_config.py')
| -rw-r--r-- | tests/test_ipalib/test_config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_ipalib/test_config.py b/tests/test_ipalib/test_config.py index 7c53efe27..6737b0863 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: |