[pypy-svn] r39181 - pypy/dist/pypy/lang/js/test/ecma

[fijal at codespeak.net]

Author: fijal
Date: Sun Feb 18 20:08:41 2007
New Revision: 39181

Modified:
   pypy/dist/pypy/lang/js/test/ecma/conftest.py
Log:
* Use JsBaseExcept
* import failed


Modified: pypy/dist/pypy/lang/js/test/ecma/conftest.py
==============================================================================
--- pypy/dist/pypy/lang/js/test/ecma/conftest.py	(original)
+++ pypy/dist/pypy/lang/js/test/ecma/conftest.py	Sun Feb 18 20:08:41 2007
@@ -1,7 +1,8 @@
 import py
 from pypy.lang.js.interpreter import *
-from pypy.lang.js.jsobj import W_Array, JsTypeError
+from pypy.lang.js.jsobj import W_Array, JsBaseExcept
 from pypy.lang.js.jsparser import JsSyntaxError
+from py.__.test.outcome import Failed
 
 rootdir = py.magic.autopath().dirpath()
 exclusionlist = ['shell.js', 'browser.js']
@@ -47,7 +48,7 @@
         t = load_source(self.filepath.read())
         try:
             t.execute(self.interp.global_context)
-        except (JsTypeError, JsSyntaxError):
+        except (JsBaseExcept, JsSyntaxError):
             raise Failed(excinfo=py.code.ExceptionInfo())
         testcases = self.interp.global_context.resolve_identifier('testcases')
         values = testcases.GetValue().array