[pypy-svn] r78109 - in pypy/branch/debug-test_import: py/_process pypy

[antocuni at codespeak.net]

Author: antocuni
Date: Wed Oct 20 10:51:55 2010
New Revision: 78109

Modified:
   pypy/branch/debug-test_import/py/_process/cmdexec.py
   pypy/branch/debug-test_import/pypy/testrunner_cfg.py
Log:
run only the relevant tests in this branch, and force cmdexec to print some useful information about the exception


Modified: pypy/branch/debug-test_import/py/_process/cmdexec.py
==============================================================================
--- pypy/branch/debug-test_import/py/_process/cmdexec.py	(original)
+++ pypy/branch/debug-test_import/py/_process/cmdexec.py	Wed Oct 20 10:51:55 2010
@@ -25,8 +25,15 @@
             default_encoding = sys.getdefaultencoding() # jython may not have it
         except AttributeError:
             default_encoding = sys.stdout.encoding or 'UTF-8'
-        out = unicode(out, process.stdout.encoding or default_encoding)
-        err = unicode(err, process.stderr.encoding or default_encoding)
+        try:
+            out = unicode(out, process.stdout.encoding or default_encoding)
+            err = unicode(err, process.stderr.encoding or default_encoding)
+        except UnicodeDecodeError:
+            print 'encoding:', process.stdout.encoding or default_encoding
+            print 'stdout:', repr(stdout)
+            print 'stderr:', repr(stderr)
+            raise
+            
     status = process.poll()
     if status:
         raise ExecutionFailed(status, status, cmd, out, err)

Modified: pypy/branch/debug-test_import/pypy/testrunner_cfg.py
==============================================================================
--- pypy/branch/debug-test_import/pypy/testrunner_cfg.py	(original)
+++ pypy/branch/debug-test_import/pypy/testrunner_cfg.py	Wed Oct 20 10:51:55 2010
@@ -15,5 +15,8 @@
 
 
 _cherrypick = os.getenv('PYPYCHERRYPICK', '')
+
+_cherrypick = 'module/imp'
+
 if _cherrypick:
     cherrypick = _cherrypick.split(':')