Changeset 8672

Timestamp:

11 Jun 2012, 10:17:33 (12 years ago)

Author:

uli

Message:

Decouple setup/teardown from multimechanize.

Location:

main/waeup.stress/trunk

Files:

• README.rst (modified) (2 diffs)
• kofa01/config.cfg (modified) (1 diff)
• kofa01/post_run.py (modified) (1 diff)
• kofa01/post_run.sh (deleted)
• kofa01/pre_run.py (added)
• kofa01/test_scripts/config.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/waeup/stress/__init__.py (modified) (1 diff)
• src/waeup/stress/run.py (added)

main/waeup.stress/trunk/README.rst

@@ -67 +67 @@
 Basically, you run a stresstest like this::
 
-  (mysandbox) $ ./bin/multimech-run <PROJECT>
+  (mysandbox) $ ./bin/stress-run <PROJECT>
 
-where ``<PROJECT>`` is one of the directories in here like 'kofa01'.
+where ``<PROJECT>`` is the name of one of the directories in here like
+'kofa01'.
 
 So,::
 
-  (mysandbox) $ ./bin/multimech-run kofa01
+  (mysandbox) $ ./bin/stress-run kofa01
 
 should give some results.
@@ -82 +83 @@
 run each test.
 
+Generally, for each test project the configuration can be done in the
+test project root. Here you will find at least a `config.cfg` for
+ini-style configuration (required) and optionally a `pre_run.py` and
+`post_run.py` to care for things like setting up an instance and
+shutting it down afterwards.
+
 Please keep in mind, that these tests normally require some local or
 remote setup, for instance a running Kofa instance with certain

main/waeup.stress/trunk/kofa01/config.cfg

@@ -9 +9 @@
 post_run_script = kofa01/post_run.sh
 
+kofa_instance = kofa
+kofa_baseport = 8080
+
+
 [user_group-1]
 threads = 5

main/waeup.stress/trunk/kofa01/post_run.py

@@ -5 +5 @@
 
 waeup.stress.stop_instance(instance)
+waeup.stress.configure()

main/waeup.stress/trunk/kofa01/test_scripts/config.py

@@ -1 @@
-import time
-import waeup.stress
+## Shared configuration parameters
+
 #register_url = 'http://localhost:8080/uniben/applicants/putme2012/register'
 register_url = 'http://localhost:8080/stress_app/@@index'
-print "RUN SETUP"
-
-instance = 'kofa'
-
-## removes any existing ZODB (for a clean ZODB at start)
-waeup.stress.remove_zodb(instance)
-
-## installs a University named 'stress_app' in root folder
-waeup.stress.install_app(instance)
-
-## starts an instance as daemon
-waeup.stress.start_instance(instance)
-waeup.stress.wait_for_startup('localhost', 8080) # wait until daemon is up
-## after starting an instance, we have to wait for the instance to come up
-#time.sleep(3)
-
-## we need a running instance, so leave this commented out.
-#waeup.stress.stop_instance(instance)

main/waeup.stress/trunk/setup.py

@@ -86 +86 @@
       [console_scripts]
       bootstrap_instances = waeup.stress:bootstrap
+      stress-run = waeup.stress.run:main
       """,
       )

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

@@ -122 +122 @@
     subprocess.call(
         './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