Changeset 8681 for main/waeup.stress/trunk/kofa01

Timestamp:

11 Jun 2012, 13:24:39 (13 years ago)

Author:

uli

Message:

Consider instance mode when starting/stopping instances.

Location:

main/waeup.stress/trunk/kofa01

Files:

• config.cfg (modified) (1 diff)
• post_run.py (modified) (1 diff)
• pre_run.py (modified) (2 diffs)

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

@@ -10 +10 @@
 kofa_instance = kofa
 kofa_baseport = 8080
-
+kofa_instance_mode = paster
 
 [user_group-1]

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

@@ -1 @@
-## Actions to do after test runs.
+"""Script run after tests have been done.
+
+This script is run with some additional globals set:
+
+- project_name: The name of this project (dir)
+- cmd_opts: Commandline args from stress-run invocation
+  Includes the stresstest-project directory.
+- cfg_opts: options as set in local config.cfg.
+
+Context Python is normally the version used when running bootstrap on
+the waeup.stress package.
+"""
 import waeup.stress
 
-instance = 'kofa'
+instance=cfg_opts['instance']
+mode = cfg_opts['instance_mode']
 
-waeup.stress.stop_instance(instance)
-waeup.stress.configure()
+waeup.stress.stop_instance(instance, mode=mode)

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

@@ -14 +14 @@
 
 instance=cfg_opts['instance']
+mode = cfg_opts['instance_mode']
+
 print "PRE-RUN.PY: using instance: waeup.%s" % instance
 
@@ -23 +25 @@
 
 ## starts an instance as daemon
-waeup.stress.start_instance(instance)
+waeup.stress.start_instance(instance, mode=mode)
 ## wait for instance to come up
 waeup.stress.wait_for_startup(cfg_opts['host'], int(cfg_opts['baseport']))