]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[1704] Don't update the environment inside check_environment_unchanged()
authorMukund Sivaraman <muks@isc.org>
Fri, 1 Jun 2012 06:19:29 +0000 (11:49 +0530)
committerMukund Sivaraman <muks@isc.org>
Fri, 1 Jun 2012 06:19:31 +0000 (11:49 +0530)
This is no longer required.

src/bin/bind10/tests/bind10_test.py.in

index 188ba8b02f8b336b7b483b680c27f77e463bad44..3b80fb5937529988d0f75aac99098214658bb1d7 100644 (file)
@@ -684,18 +684,7 @@ class TestStartStopProcessesBob(unittest.TestCase):
     """
     def check_environment_unchanged(self):
         # Check whether the environment has not been changed
-
-        # First, we delete the B10_LOCKFILE_DIR_FROM_BUILD key from both
-        # environments' copies. This is because this key can be
-        # set/updated during initialization and we don't care if it
-        # changes. We only test the rest of the environment.
-        cur_os_environ = copy.deepcopy(os.environ)
-        if "B10_LOCKFILE_DIR_FROM_BUILD" in original_os_environ:
-            original_os_environ.pop("B10_LOCKFILE_DIR_FROM_BUILD")
-        if "B10_LOCKFILE_DIR_FROM_BUILD" in cur_os_environ:
-            cur_os_environ.pop("B10_LOCKFILE_DIR_FROM_BUILD")
-
-        self.assertEqual(original_os_environ, cur_os_environ)
+        self.assertEqual(original_os_environ, os.environ)
 
     def check_started(self, bob, core, auth, resolver):
         """