Google Test's Python tests now pass on Solaris.

git-svn-id: http://googletest.googlecode.com/svn/trunk@374 861a406c-534a-0410-8894-cb66d6ee9925

1 files changed, 4 insertions, 10 deletions

diff --git a/test/gtest_shuffle_test.py b/test/gtest_shuffle_test.py
index a870a01..30d0303 100755
--- a/test/gtest_shuffle_test.py
+++ b/test/gtest_shuffle_test.py
@@ -78,16 +78,10 @@ def RandomSeedFlag(n):
 def RunAndReturnOutput(extra_env, args):
   """Runs the test program and returns its output."""
 
-  try:
-    original_env = os.environ.copy()
-    os.environ.update(extra_env)
-    return gtest_test_utils.Subprocess([COMMAND] + args).output
-  finally:
-    for key in extra_env.iterkeys():
-      if key in original_env:
-        os.environ[key] = original_env[key]
-      else:
-        del os.environ[key]
+  environ_copy = os.environ.copy()
+  environ_copy.update(extra_env)
+
+  return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy).output
 
 
 def GetTestsForAllIterations(extra_env, args):