Browse Source

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

This is no longer required.
Mukund Sivaraman 13 years ago
parent
commit
f68857bea3
1 changed files with 1 additions and 12 deletions
  1. 1 12
      src/bin/bind10/tests/bind10_test.py.in

+ 1 - 12
src/bin/bind10/tests/bind10_test.py.in

@@ -684,18 +684,7 @@ class TestStartStopProcessesBob(unittest.TestCase):
     """
     """
     def check_environment_unchanged(self):
     def check_environment_unchanged(self):
         # Check whether the environment has not been changed
         # 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):
     def check_started(self, bob, core, auth, resolver):
         """
         """