floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r58012] fix imports so that tests pass against pypy-dist 

--HG--
branch : trunk
This commit is contained in:
hpk 2008-09-09 19:02:28 +02:00
parent 39440c91c9
commit 05f2d6441d
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
py/test/report/testing/test_web.py
View File

@ -15,14 +15,14 @@ def setup_module(mod):
mod.commproxy.USE_MOCHIKIT = False mod.commproxy.USE_MOCHIKIT = False
mod.rpython2javascript = rpython2javascript mod.rpython2javascript = rpython2javascript
mod.commproxy = mod.commproxy mod.commproxy = mod.commproxy
from py.__.test.dsession.web import TestHandler as _TestHandler from py.__.test.report.web import TestHandler as _TestHandler
from py.__.test.dsession.web import MultiQueue from py.__.test.report.web import MultiQueue
mod._TestHandler = _TestHandler mod._TestHandler = _TestHandler
mod.MultiQueue = MultiQueue mod.MultiQueue = MultiQueue
def test_js_generate(): def test_js_generate():
from py.__.test.dsession import webjs from py.__.test.report import webjs
from py.__.test.dsession.web import FUNCTION_LIST, IMPORTED_PYPY from py.__.test.report.web import FUNCTION_LIST, IMPORTED_PYPY
source = rpython2javascript(webjs, FUNCTION_LIST, use_pdb=False) source = rpython2javascript(webjs, FUNCTION_LIST, use_pdb=False)
assert source assert source

8
py/test/report/testing/test_webjs.py
View File

@ -12,8 +12,8 @@ def check(mod):
mod.dom = dom mod.dom = dom
mod.schedule_callbacks = schedule_callbacks mod.schedule_callbacks = schedule_callbacks
from py.__.test.dsession import webjs from py.__.test.report import webjs
from py.__.test.dsession.web import exported_methods from py.__.test.report.web import exported_methods
mod.webjs = webjs mod.webjs = webjs
mod.exported_methods = exported_methods mod.exported_methods = exported_methods
mod.here = py.magic.autopath().dirpath() mod.here = py.magic.autopath().dirpath()
@ -28,8 +28,8 @@ def setup_module(mod):
mod.dom = dom mod.dom = dom
dom.window = dom.Window(html) dom.window = dom.Window(html)
dom.document = dom.window.document dom.document = dom.window.document
from py.__.test.dsession import webjs from py.__.test.report import webjs
from py.__.test.dsession.web import exported_methods from py.__.test.report.web import exported_methods
mod.webjs = webjs mod.webjs = webjs
mod.exported_methods = exported_methods mod.exported_methods = exported_methods

6
py/test/report/web.py
View File

@ -14,10 +14,8 @@ import sys
import socket import socket
import py import py
from py.__.test.dsession.dsession import RSession from py.test import collect
from py.__.test import event from py.__.test.report.webdata import json
from py.__.test import collect
from py.__.test.dsession.webdata import json
DATADIR = py.path.local(__file__).dirpath("webdata") DATADIR = py.path.local(__file__).dirpath("webdata")
FUNCTION_LIST = ["main", "show_skip", "show_traceback", "show_info", "hide_info", FUNCTION_LIST = ["main", "show_skip", "show_traceback", "show_info", "hide_info",

2
py/test/report/webjs.py
View File

@ -3,7 +3,7 @@
""" """
import py import py
from py.__.test.dsession.web import exported_methods from py.__.test.report.web import exported_methods
try: try:
from pypy.translator.js.modules import dom from pypy.translator.js.modules import dom
from pypy.translator.js.helper import __show_traceback from pypy.translator.js.helper import __show_traceback