[pypy-svn] r60892 - in pypy/build/testrunner: . test

[pedronis at codespeak.net]

Author: pedronis
Date: Sun Jan 11 23:12:46 2009
New Revision: 60892

Modified:
   pypy/build/testrunner/runner.py
   pypy/build/testrunner/test/test_runner.py
Log:
trying to avoid double line endings in the web pages of logs produced on windows



Modified: pypy/build/testrunner/runner.py
==============================================================================
--- pypy/build/testrunner/runner.py	(original)
+++ pypy/build/testrunner/runner.py	Sun Jan 11 23:12:46 2009
@@ -17,12 +17,17 @@
                 win32api.CloseHandle(proch)
             except pywintypes.error, e:
                 pass
+
+    READ_MODE = 'rU'
+    WRITE_MODE = 'wb'
 else:
     def _kill(pid, sig):
         try:
             os.kill(pid, sig)
         except OSError:
             pass
+    READ_MODE = 'r'
+    WRITE_MODE = 'w'
 
 EXECUTEFAILED = -1001
 RUNFAILED  = -1000
@@ -144,11 +149,11 @@
             exitcode = EXECUTEFAILED
 
         if one_output.check(file=1):            
-            output = one_output.read()
+            output = one_output.read(READ_MODE)
         else:
             output = ""
         if logfname.check(file=1):
-            logdata = logfname.read()
+            logdata = logfname.read(READ_MODE)
         else:
             logdata = ""
 
@@ -293,11 +298,11 @@
         print "no logfile specified"
         sys.exit(2)
 
-    logfile = open(opts.logfile, "w")
+    logfile = open(opts.logfile, WRITE_MODE)
     if opts.output == '-':
         out = sys.stdout
     else:
-        out = open(opts.output, "w")
+        out = open(opts.output, WRITE_MODE)
 
     root = py.path.local(opts.root)
 

Modified: pypy/build/testrunner/test/test_runner.py
==============================================================================
--- pypy/build/testrunner/test/test_runner.py	(original)
+++ pypy/build/testrunner/test/test_runner.py	Sun Jan 11 23:12:46 2009
@@ -169,9 +169,15 @@
 
         assert res
 
-        assert out.getvalue()
-
-        log_lines = log.getvalue().splitlines()
+        out = out.getvalue()
+        assert out
+        assert '\r\n' not in out
+        assert '\n' in out
+
+        log = log.getvalue()
+        assert '\r\n' not in log
+        assert '\n' in log        
+        log_lines = log.splitlines()
 
         assert log_lines[0] == ". test_normal/test_example.py:test_one"
         nfailures = 0