Commit fc0b9775 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

scalability: rename serial-test -> serialise-test.

parent 608391f8
......@@ -143,7 +143,7 @@ class ScalabilityLauncher(object):
metavar='SITE_AVAILABILITY_URL',
help='Url to check instance availability')
parser.add_argument('--serial-test',
parser.add_argument('--serialise-test',
metavar='SERIAL_TEST',
action='store_true',
help='Without this option, all test methods are invoked in parallel')
......@@ -240,7 +240,7 @@ class ScalabilityLauncher(object):
instance_url = self.__argumentNamespace.instance_url
metric_url = self.__argumentNamespace.metric_url
site_availability_url = self.__argumentNamespace.site_availability_url
serial_test = self.__argumentNamespace.serial_test
serialise_test = self.__argumentNamespace.serialise_test
# To take metrics
metric_thread_stop_event = threading.Event()
......@@ -311,12 +311,12 @@ class ScalabilityLauncher(object):
# Launch command
test_thread = TestThread(process_manager, command, self.log, env=exec_env)
test_thread.start()
if serial_test:
if serialise_test:
self.log("Going to sleep for %s seconds." % str(test_duration))
test_thread.join(test_duration)
if test_thread.is_alive():
process_manager.killPreviousRun()
if not serial_test:
if not serialise_test:
# Sleep
self.log("Going to sleep for %s seconds." % str(max_test_duration))
time.sleep(max_test_duration)
......
......@@ -397,7 +397,7 @@ Require valid-user
self.frontend_address = configuration.get("frontend-address")
self.instance_software_release = configuration.get('instance-software-release')
self.use_existing_setup = self.instance_name is not None and self.frontend_address is not None
self.serial_test = configuration.get('serial-test', False)
self.serialise_test = configuration.get('serialise-test', False)
node_test_suite.edit(configuration_list=configuration_list)
self.launcher_nodes_computer_guid = test_configuration['launcher_nodes_computer_guid']
......@@ -654,8 +654,8 @@ Require valid-user
"--metric-url", metric_url,
"--site-availability-url", site_availability_url,
]
if self.serial_test:
command.append('--serial-test')
if self.serialise_test:
command.append('--serialise-test')
logger.info("Running test case...")
test_thread = TestThread(self.testnode.process_manager, command, logger.info, env=self.exec_env)
test_thread.start()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment