[Erp5-report] r43390 rafael - /erp5/trunk/utils/erp5.appliance.test/src/test.py

[nobody at svn.erp5.org]

Author: rafael
Date: Wed Feb 16 22:34:33 2011
New Revision: 43390

URL: http://svn.erp5.org?rev=43390&view=rev
Log:
Allow provide custom places to create sofware and instances.

Modified:
    erp5/trunk/utils/erp5.appliance.test/src/test.py

Modified: erp5/trunk/utils/erp5.appliance.test/src/test.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.appliance.test/src/test.py?rev=43390&r1=43389&r2=43390&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] Wed Feb 16 22:34:33 2011
@@ -560,10 +560,20 @@ def run(config,
                 software_profile_url,
                 instance_profile_url,
                 binary_bootstrap_file_name, suite_name):
-  software_path = os.path.abspath(os.path.join(config.run_directory_path,
-                                               'software'))
-  instance_path = os.path.abspath(os.path.join(config.run_directory_path,
-                                               'instance'))
+
+  _software_path = config.software_path
+  _instance_path = config.instance_path
+
+  if _software_path == "":
+    _software_path = os.path.join(config.run_directory_path,
+                                  'software')
+
+  if _instance_path == "":
+    _instance_path = os.path.join(config.run_directory_path,
+                                  'instance')
+
+  software_path = os.path.abspath(_software_path)
+  instance_path = os.path.abspath(_instance_path)
   sleep_period = 600
 
   # Define loglevel
@@ -669,7 +679,14 @@ class Parser(OptionParser):
              type=str,
              default="https://svn.erp5.org/repos/public/erp5/trunk/buildout"),
 
- 
+      Option("-a", "--software_path",
+             help="Custom place to setup software.",
+             type=str,
+             default=""),
+      Option("-d", "--instance_path",
+             help="Custom place to setup instance.",
+             type=str,
+             default=""), 
     ])
 
   def check_args(self):