[py-svn] r37277 - py/trunk/py/test/rsession/testing

[hpk at codespeak.net]

Author: hpk
Date: Wed Jan 24 17:40:06 2007
New Revision: 37277

Added:
   py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp
      - copied, changed from r37267, py/trunk/py/test/rsession/testing/test_webjs.py
Log:
merging of file:///svn/py/branch/config/py/test/rsession/testing/test_webjs.py
revisions 36936 to 37267:

    ------------------------------------------------------------------------
    r36986 | fijal | 2007-01-19 13:05:58 +0100 (Fri, 19 Jan 2007) | 4 lines
    
    Improve the behaviour off cleanup and channel closing, at least on slave side.
    Some cleanups, got rid of some hacks (in favor of other hacks, but posix
    is a bit hackish anyway)
    
    ------------------------------------------------------------------------
    r36943 | fijal | 2007-01-18 16:09:30 +0100 (Thu, 18 Jan 2007) | 3 lines
    
    at least LSession should work now. Did not touched yet the remote options stuff,
    but some simplifications were done.
    
    ------------------------------------------------------------------------
    r36937 | fijal | 2007-01-18 14:22:54 +0100 (Thu, 18 Jan 2007) | 2 lines
    
    Create a branch for further config cleanups.
    
    ------------------------------------------------------------------------


Copied: py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp (from r37267, py/trunk/py/test/rsession/testing/test_webjs.py)
==============================================================================
--- py/trunk/py/test/rsession/testing/test_webjs.py	(original)
+++ py/trunk/py/test/rsession/testing/test_webjs.py.merge.tmp	Wed Jan 24 17:40:06 2007
@@ -23,9 +23,7 @@
     dom.window = dom.Window(html)
     dom.document = dom.window.document
     config = py.test.config._reparse([])
-    from py.__.test.rsession.rsession import session_options
-    session_options.bind_config(config)
-    session_options.import_pypy = True
+    config._overwrite('_dist_import_pypy', True)
     from py.__.test.rsession import webjs
     from py.__.test.rsession.web import exported_methods
     mod.webjs = webjs