Make script more generic so both scalability and deployment tests could use it.

bt5/erp5_wendelin_scalability_test/SkinTemplateItem/portal_skins/erp5_wendelin_scalability_test/ERP5Site_bootstrapScalabilityTest.py

@@ -11,7 +11,8 @@ portal_catalog = portal.portal_catalog
 status_code = 0
 error_message = "No error."
 
-context.ERP5Site_setUpActivityTool()
+if setup_activity_tool:
+  context.ERP5Site_setUpActivityTool()
 
 if user_quantity is None: 
   return json.dumps({"status_code" : 1, 
@@ -42,10 +43,12 @@ if configurator.getSimulationState() == "draft":
 
 # create users if installation is done
 try:
-  context.portal_categories.activate(after_method_id = ('ERP5Site_afterConfigurationSetup',
+  if create_test_data:
+    context.portal_categories.activate(after_method_id = ('ERP5Site_afterConfigurationSetup',
                                      'immediateReindexObject')
                                      ).ERP5Site_createTestData(user_quantity, password)
-  context.portal_categories.activate(after_method_id = ('ERP5Site_afterConfigurationSetup',
+  if set_id_generator:
+    context.portal_categories.activate(after_method_id = ('ERP5Site_afterConfigurationSetup',
                                      'immediateReindexObject')
                                      ).ERP5Site_setIdGenerator()
 except Exception as e:

bt5/erp5_wendelin_scalability_test/SkinTemplateItem/portal_skins/erp5_wendelin_scalability_test/ERP5Site_bootstrapScalabilityTest.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>user_quantity=None</string> </value>
+            <value> <string>user_quantity=None, setup_activity_tool=True, create_test_data=True, set_id_generator=True</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>