Changeset 8690 for main/waeup.stress/trunk/src/waeup/stress

Timestamp:

12 Jun 2012, 10:14:36 (12 years ago)

Author:

uli

Message:

Clean up.

File:

• main/waeup.stress/trunk/src/waeup/stress/__init__.py (modified) (6 diffs)

main/waeup.stress/trunk/src/waeup/stress/__init__.py

@@ -4 +4 @@
 import sys
 import time
-#import waeup.kofa
 
-AVAILABLE_KOFA_PROJECTS = ['waeup.kofa',]
 packages = dict()
-kofa_projects = dict()
 
 root = os.path.dirname(os.path.dirname(os.path.dirname(
@@ -29 +26 @@
 
 print "WAEUP.STRESS.INIT: INSTANCES: ", instances
-
-def do_foo():
-    mydir = os.path.dirname(os.path.dirname(__file__))
-    print "MYDIR", mydir
-    #import pdb; pdb.set_trace()
 
 def enable_datafs(path, proj_name):
@@ -86 +78 @@
     path = instances[name]
     print "WAEUP.STRESS: starting instance %s at %s using %s" % (
-        name, path, mode),
+        name, path, mode)
     old_cwd_ = os.getcwd()
     os.chdir(path)
@@ -106 +98 @@
 def wait_for_startup(host, port):
     """Wait until a connection to host and port can be made.
+
+    After a timeout of 10 secs we abort raising an IOError.
     """
+    print "WAEUP.STRESS.INIT: waiting for instance(s) to come up on %s:%s" % (
+        host, port)
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    start = time.time()
     while True:
+        if time.time() - 10 > start:
+            raise IOError('timeout while waiting for instance to come up')
         try:
             s.connect((host, port))
@@ -115 +114 @@
             time.sleep(0.1)
     s.close()
+    print "WAEUP.STRESS.INIT: instance(s) up after %.2f secs" % (
+        time.time() - start,)
     return
 
@@ -156 +157 @@
         './bin/python-console %s' % script, shell=True)
     os.chdir(old_cwd_)
-
-def configure():
-    import ConfigParser
-    from multimechanize.utilities.run import project_name, cmd_opts, args
-    print "Configure"
-    print "PROJECT NAME: ", project_name