Author: Stephan <[email protected]>
Branch:
Changeset: r130:12e28afbb3bf
Date: 2011-10-04 13:00 +0200
http://bitbucket.org/pypy/lang-js/changeset/12e28afbb3bf/
Log: fixed ecma test execution
diff --git a/js/jsobj.py b/js/jsobj.py
--- a/js/jsobj.py
+++ b/js/jsobj.py
@@ -167,8 +167,9 @@
if self.callfunc is None: # XXX Not sure if I should raise it here
raise JsTypeError('not a function')
# TODO
- from js.jsobj import W_Root
- assert isinstance(this, W_Root)
+ if this:
+ from js.jsobj import W_Root
+ assert isinstance(this, W_Root)
from js.jsexecution_context import make_activation_context,
make_function_context
diff --git a/js/test/ecma/conftest.py b/js/test/ecma/conftest.py
--- a/js/test/ecma/conftest.py
+++ b/js/test/ecma/conftest.py
@@ -20,7 +20,7 @@
import py
from _pytest.runner import Failed
-from js.interpreter import *
+from js.interpreter import Interpreter, load_file, W_Builtin, W_IntNumber,
W_Eval
from js.jsobj import W_Array, W_String
from js import interpreter
from js.execution import JsBaseExcept
@@ -47,6 +47,7 @@
if self.session.config.getvalue("ecma") is not True:
pytest.skip("ECMA tests disabled, run with --ecma")
+
self.init_interp()
#actually run the file :)
t = load_file(str(self.fspath))
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
