[pypy-svn] r8220 - pypy/branch/src-pytest/pypy/interpreter/test

[hpk at codespeak.net]

Author: hpk
Date: Tue Jan 11 18:10:36 2005
New Revision: 8220

Modified:
   pypy/branch/src-pytest/pypy/interpreter/test/test_main.py
Log:
read file with universal readline (fixes bug on win) 
and use asserts more directly. 



Modified: pypy/branch/src-pytest/pypy/interpreter/test/test_main.py
==============================================================================
--- pypy/branch/src-pytest/pypy/interpreter/test/test_main.py	(original)
+++ pypy/branch/src-pytest/pypy/interpreter/test/test_main.py	Tue Jan 11 18:10:36 2005
@@ -27,7 +27,7 @@
     finally:
         space.setattr(w_sys, space.wrap("stdout"), w_oldout)
     capturefile.close() 
-    return capturefn.read() == expected_output
+    assert capturefn.read(mode='rU') == expected_output
 
 
 testfn = 'tmp_hello_world.py'
@@ -43,10 +43,10 @@
         os.remove(testfn)
 
     def test_run_file(self):
-        assert checkoutput(self.space, testresultoutput,main.run_file,testfn)
+        checkoutput(self.space, testresultoutput,main.run_file,testfn)
 
     def test_run_string(self):
-        assert checkoutput(self.space, testresultoutput,
+        checkoutput(self.space, testresultoutput,
                                  main.run_string,testcode,testfn)
 
     def test_eval_string(self):