From 391d66e4af065f118c0f817d2d7fc67b4109ddab Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Mon, 18 Oct 2010 14:52:46 -0400
Subject: Fix _merge_from_file test

---
 tests/test_ipalib/test_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

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)
-- 
cgit