diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-10-18 14:52:46 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-10-18 15:52:20 -0400 |
| commit | 391d66e4af065f118c0f817d2d7fc67b4109ddab (patch) | |
| tree | 19c932ddc3545650831e135315b70f6b9c144895 /tests | |
| parent | fe7d97a3d925e07bc4ba81f4859dbe11a223948a (diff) | |
| download | freeipa-391d66e4af065f118c0f817d2d7fc67b4109ddab.tar.gz freeipa-391d66e4af065f118c0f817d2d7fc67b4109ddab.tar.xz freeipa-391d66e4af065f118c0f817d2d7fc67b4109ddab.zip | |
Fix _merge_from_file test
Diffstat (limited to 'tests')
| -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 d1ca55d41..179ee1f0c 100644 --- a/tests/test_ipalib/test_config.py +++ b/tests/test_ipalib/test_config.py @@ -389,7 +389,7 @@ class test_Env(ClassChecker): assert o._merge_from_file(override) == (4, 6) for (k, v) in orig.items(): assert o[k] is v - assert list(o) == sorted(keys + ('key0', 'key1', 'key2', 'key3')) + assert list(o) == sorted(keys + ('key0', 'key1', 'key2', 'key3', 'config_loaded')) for i in xrange(4): assert o['key%d' % i] == ('var%d' % i) keys = tuple(o) |