[py-svn] r35293 - in py/dist/py/test/rsession: . testing webdata

[fijal at codespeak.net]

Author: fijal
Date: Tue Dec  5 13:33:55 2006
New Revision: 35293

Modified:
   py/dist/py/test/rsession/hostmanage.py
   py/dist/py/test/rsession/testing/test_webjs.py
   py/dist/py/test/rsession/webdata/source.js
Log:
Fix the redness of the localhost and fix some tests.


Modified: py/dist/py/test/rsession/hostmanage.py
==============================================================================
--- py/dist/py/test/rsession/hostmanage.py	(original)
+++ py/dist/py/test/rsession/hostmanage.py	Tue Dec  5 13:33:55 2006
@@ -83,6 +83,8 @@
     for num, host, gw, remoterootpath in hosts:
         if (host, remoterootpath) in rsynced or (host == 'localhost' \
             and optimise_localhost):
+            key = host + str(num)
+            reporter(report.HostReady(host, key))
             continue
         rsynced[(host, remoterootpath)] = True
         def done(host=host, num=num):

Modified: py/dist/py/test/rsession/testing/test_webjs.py
==============================================================================
--- py/dist/py/test/rsession/testing/test_webjs.py	(original)
+++ py/dist/py/test/rsession/testing/test_webjs.py	Tue Dec  5 13:33:55 2006
@@ -3,15 +3,22 @@
     import pypy
 except ImportError:
     py.test.skip('missing PyPy')
-from pypy.translator.js.modules import dom
-from py.__.test.rsession import webjs
+
 
 here = py.magic.autopath().dirpath()
 
 def setup_module(mod):
     # load HTML into window object
     html = here.join('../webdata/index.html').read()
+    from pypy.translator.js.modules import dom
+    mod.dom = dom
     dom.window = dom.Window(html)
+    config, args = py.test.Config.parse([])
+    from py.__.test.rsession.rsession import session_options
+    session_options.bind_config(config)
+    session_options.import_pypy = True
+    from py.__.test.rsession import webjs
+    mod.webjs = webjs
 
 def test_html_loaded():
     body = dom.window.document.getElementsByTagName('body')[0]

Modified: py/dist/py/test/rsession/webdata/source.js
==============================================================================
Binary files. No diff available.