[Freeipa-devel] [PATCH] fix merge_from_file test

[Rob Crittenden]

Pushed as 1-liner

diff --git a/tests/test_ipalib/test_config.py 
b/tests/test_ipalib/test_config.py
index d1ca55d..179ee1f 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', 'confi
g_loaded'))
          for i in xrange(4):
              assert o['key%d' % i] == ('var%d' % i)
          keys = tuple(o)

rob