From: Mukund Sivaraman <muks@isc.org>
Date: Fri, 1 Jun 2012 06:19:29 +0000 (+0530)
Subject: [1704] Don't update the environment inside check_environment_unchanged()
X-Git-Tag: trac2351_base~226^2~60^2^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f68857bea3699eb23c72ddac04a20aa8f42bd551;p=thirdparty%2Fkea.git

[1704] Don't update the environment inside check_environment_unchanged()

This is no longer required.
---

diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index 188ba8b02f..3b80fb5937 100644
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -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):
         """