[pypy-svn] r55226 - pypy/branch/js-refactoring/pypy/lang/js/test/ecma

[santagada at codespeak.net]

Author: santagada
Date: Mon May 26 01:08:49 2008
New Revision: 55226

Modified:
   pypy/branch/js-refactoring/pypy/lang/js/test/ecma/conftest.py
   pypy/branch/js-refactoring/pypy/lang/js/test/ecma/shell.js
Log:
better error reporting, run with py.test --ecma --tb=short -s

Modified: pypy/branch/js-refactoring/pypy/lang/js/test/ecma/conftest.py
==============================================================================
--- pypy/branch/js-refactoring/pypy/lang/js/test/ecma/conftest.py	(original)
+++ pypy/branch/js-refactoring/pypy/lang/js/test/ecma/conftest.py	Mon May 26 01:08:49 2008
@@ -91,10 +91,9 @@
         r3 = ctx.resolve_identifier('run_test')
         w_test_number = W_IntNumber(self.number)
         result = r3.Call(ctx=ctx, args=[w_test_number]).ToString()
+        __tracebackhide__ = True
         if result != "passed":
             raise Failed(msg=result)
-        elif result == -1:
-            py.test.skip()
 
     _handling_traceback = False
     def _getpathlineno(self):

Modified: pypy/branch/js-refactoring/pypy/lang/js/test/ecma/shell.js
==============================================================================
--- pypy/branch/js-refactoring/pypy/lang/js/test/ecma/shell.js	(original)
+++ pypy/branch/js-refactoring/pypy/lang/js/test/ecma/shell.js	Mon May 26 01:08:49 2008
@@ -77,7 +77,7 @@
   this.actual      = a;
   this.passed      = true;
   this.reason      = "";
-  print (n, d, e, a);
+  // print (n, d, e, a);
   this.bugnumber   = BUGNUMBER;
 
   this.passed = getTestCaseResult( this.expect, this.actual );
@@ -198,7 +198,7 @@
 function run_test(tc) {
     // try {
         getTestCaseResult(testcases[tc].expect, testcases[tc].actual);
-        testcases[tc].reason += ( testcases[tc].passed ) ? "passed" : "wrong value expected: "
+        testcases[tc].reason += ( testcases[tc].passed ) ? "passed" : testcases[tc].description + " wrong value expected: "
                                 +testcases[tc].expect+" but got: "+ testcases[tc].actual;
         return testcases[tc].reason;
     // }
@@ -219,7 +219,7 @@
 }
 
 function writeHeaderToLog( string ) {
-  print( string );
+  // print( string );
 }
 /* end of print functions */