[Python-checkins] cpython (2.7): fix test_gdb under hash randomization

[benjamin.peterson]

http://hg.python.org/cpython/rev/a0b663935b45
changeset:   75104:a0b663935b45
branch:      2.7
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Feb 20 21:55:32 2012 -0500
summary:
  fix test_gdb under hash randomization

files:
  Lib/test/test_gdb.py |  17 +++++++++++------
  1 files changed, 11 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -58,13 +58,18 @@
 
     """Test that the debugger can debug Python."""
 
-    def run_gdb(self, *args):
+    def run_gdb(self, *args, **env_vars):
         """Runs gdb with the command line given by *args.
 
         Returns its stdout, stderr
         """
+        if env_vars:
+            env = os.environ.copy()
+            env.update(env_vars)
+        else:
+            env = None
         out, err = subprocess.Popen(
-            args, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+            args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env
             ).communicate()
         return out, err
 
@@ -124,7 +129,7 @@
         # print ' '.join(args)
 
         # Use "args" to invoke gdb, capturing stdout, stderr:
-        out, err = self.run_gdb(*args)
+        out, err = self.run_gdb(*args, PYTHONHASHSEED='0')
 
         # Ignore some noise on stderr due to the pending breakpoint:
         err = err.replace('Function "%s" not defined.\n' % breakpoint, '')
@@ -213,7 +218,7 @@
         'Verify the pretty-printing of dictionaries'
         self.assertGdbRepr({})
         self.assertGdbRepr({'foo': 'bar'})
-        self.assertGdbRepr({'foo': 'bar', 'douglas':42})
+        self.assertGdbRepr("{'foo': 'bar', 'douglas':42}")
 
     def test_lists(self):
         'Verify the pretty-printing of lists'
@@ -273,8 +278,8 @@
     def test_frozensets(self):
         'Verify the pretty-printing of frozensets'
         self.assertGdbRepr(frozenset())
-        self.assertGdbRepr(frozenset(['a', 'b']))
-        self.assertGdbRepr(frozenset([4, 5, 6]))
+        self.assertGdbRepr("frozenset(['a', 'b'])")
+        self.assertGdbRepr("frozenset([4, 5, 6])")
 
     def test_exceptions(self):
         # Test a RuntimeError

-- 
Repository URL: http://hg.python.org/cpython