diff options
Diffstat (limited to 'testcases/features')
| -rwxr-xr-x | testcases/features/copper.py | 1 | ||||
| -rwxr-xr-x | testcases/features/doctor.py | 1 | ||||
| -rwxr-xr-x | testcases/features/domino.py | 1 | ||||
| -rwxr-xr-x | testcases/features/sfc/sfc.py | 6 | ||||
| -rwxr-xr-x | testcases/features/sfc/sfc_colorado1.py | 13 |
5 files changed, 12 insertions, 10 deletions
diff --git a/testcases/features/copper.py b/testcases/features/copper.py index be6744a95..ab0162626 100755 --- a/testcases/features/copper.py +++ b/testcases/features/copper.py @@ -43,7 +43,6 @@ def main(): log_file = RESULTS_DIR + "/copper.log" ret_val = functest_utils.execute_command(cmd, - exit_on_error=False, output_file=log_file) stop_time = time.time() diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py index 6c26875d3..00e5c1d6b 100755 --- a/testcases/features/doctor.py +++ b/testcases/features/doctor.py @@ -52,7 +52,6 @@ def main(): ret = functest_utils.execute_command(cmd, info=True, - exit_on_error=False, output_file=log_file) stop_time = time.time() diff --git a/testcases/features/domino.py b/testcases/features/domino.py index 75351a56e..7705c07bd 100755 --- a/testcases/features/domino.py +++ b/testcases/features/domino.py @@ -42,7 +42,6 @@ def main(): start_time = time.time() ret = ft_utils.execute_command(cmd, - exit_on_error=False, output_file=log_file) stop_time = time.time() diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py index c701bd0f3..72b4e00cb 100755 --- a/testcases/features/sfc/sfc.py +++ b/testcases/features/sfc/sfc.py @@ -174,7 +174,8 @@ def main(): instance = os_utils.create_instance_and_wait_for_active(FLAVOR, image_id, network_id, - INSTANCE_NAME) + INSTANCE_NAME, + av_zone='nova') if instance is None: logger.error("Error while booting instance.") @@ -214,7 +215,8 @@ def main(): instance_2 = os_utils.create_instance_and_wait_for_active(FLAVOR, image_id, network_id, - INSTANCE_NAME_2) + INSTANCE_NAME_2, + av_zone='nova') if instance_2 is None: logger.error("Error while booting instance.") diff --git a/testcases/features/sfc/sfc_colorado1.py b/testcases/features/sfc/sfc_colorado1.py index 2e8d81611..ef3a489cf 100755 --- a/testcases/features/sfc/sfc_colorado1.py +++ b/testcases/features/sfc/sfc_colorado1.py @@ -172,10 +172,12 @@ def main(): logger.debug( "Configuration:\n name=%s \n flavor=%s \n image=%s \n " "network=%s \n" % (INSTANCE_NAME, FLAVOR, image_id, network_id)) - instance = os_utils.create_instance_and_wait_for_active(FLAVOR, - image_id, - network_id, - INSTANCE_NAME) + instance = os_utils.create_instance_and_wait_for_active( + FLAVOR, + image_id, + network_id, + INSTANCE_NAME, + av_zone='nova') if instance is None: logger.error("Error while booting instance.") @@ -221,7 +223,8 @@ def main(): FLAVOR, image_id, network_id, - INSTANCE_NAME_2) + INSTANCE_NAME_2, + av_zone='nova') if instance_2 is None: logger.error("Error while booting instance.") |