[py-svn] r37274 - py/trunk/py/test/rsession

[hpk at codespeak.net]

Author: hpk
Date: Wed Jan 24 17:39:56 2007
New Revision: 37274

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

    ------------------------------------------------------------------------
    r37065 | arigo | 2007-01-20 17:15:10 +0100 (Sat, 20 Jan 2007) | 3 lines
    
    Choose a random free port when using the --runbrowser option,
    but stick to the fixed 8000 when using --startserver only.
    
    ------------------------------------------------------------------------
    r36993 | fijal | 2007-01-19 14:54:25 +0100 (Fri, 19 Jan 2007) | 2 lines
    
    Add possibility to scroll or not to scroll to web frontend. This checkin makes me believe that there is lot of stuff to do in JS backend.
    
    ------------------------------------------------------------------------
    r36955 | hpk | 2007-01-18 17:44:21 +0100 (Thu, 18 Jan 2007) | 4 lines
    
    some mods to defaultconfest dist options
    and use "_dist_import_pypy", i.e. a leading underscore
    at least
    
    ------------------------------------------------------------------------
    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/web.py.merge.tmp (from r37267, py/trunk/py/test/rsession/web.py)
==============================================================================
--- py/trunk/py/test/rsession/web.py	(original)
+++ py/trunk/py/test/rsession/web.py.merge.tmp	Wed Jan 24 17:39:56 2007
@@ -14,18 +14,18 @@
 import socket
 
 import py
-from py.__.test.rsession.rsession import RSession, session_options
+from py.__.test.rsession.rsession import RSession
 from py.__.test.rsession import report
 from py.__.test import collect
 from py.__.test.rsession.webdata import json
 
 DATADIR = py.path.local(__file__).dirpath("webdata")
 FUNCTION_LIST = ["main", "show_skip", "show_traceback", "show_info", "hide_info",
-    "show_host", "hide_host", "hide_messagebox"]
+    "show_host", "hide_host", "hide_messagebox", "opt_scroll"]
 
 try:
     try:
-        if not session_options.import_pypy:
+        if not py.test.config.getvalue('_dist_import_pypy'):
             raise ImportError
     except AttributeError:
         pass
@@ -416,10 +416,10 @@
 
     if start_new:
         thread.start_new_thread(httpd.serve_forever, ())
-        print "Server started, listening on %s" % (server_address,)
+        print "Server started, listening on port %d" % (httpd.server_port,)
         return httpd
     else:
-        print "Server started, listening on %s" % (server_address,)
+        print "Server started, listening on port %d" % (httpd.server_port,)
         httpd.serve_forever()
 
 def kill_server():