[pypy-svn] r29280 - pypy/dist/pypy/translator/js/modules/test

arigo at codespeak.net arigo at codespeak.net
Fri Jun 23 21:54:17 CEST 2006

Author: arigo
Date: Fri Jun 23 21:54:17 2006
New Revision: 29280

Import the local conftest to check options.  Fixes a crash when the
test is run as part of a whole-scale py.test.

Modified: pypy/dist/pypy/translator/js/modules/test/test_xmlhttp.py
--- pypy/dist/pypy/translator/js/modules/test/test_xmlhttp.py	(original)
+++ pypy/dist/pypy/translator/js/modules/test/test_xmlhttp.py	Fri Jun 23 21:54:17 2006
@@ -3,7 +3,7 @@
 import py
-from pypy import conftest
+from pypy.translator.js import conftest
 if not conftest.option.browser or not conftest.option.tg:
     py.test.skip("Works only in browser and with turbogears")

More information about the Pypy-commit mailing list