From 75124a19a187242f57b4b4e0267e40a0b11cbfdf Mon Sep 17 00:00:00 2001
From: Morgan Richomme <morgan.richomme@orange.com>
Date: Mon, 24 Aug 2015 11:04:42 +0200
Subject: workaround order of env settings to all ODL tests to be run
JIRA: FUNCTEST-39
Change-Id: I9d9ad0d9916da7927dace7b968c975c99032738a
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---
testcases/config_functest.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'testcases')
diff --git a/testcases/config_functest.py b/testcases/config_functest.py
index 3c608344a..9268aa611 100644
--- a/testcases/config_functest.py
+++ b/testcases/config_functest.py
@@ -90,6 +90,12 @@ def action_start():
logger.debug("Cleaning possible functest environment leftovers.")
action_clean()
+ logger.info("Installing ODL environment...")
+ if not install_odl():
+ logger.error("There has been a problem while installing Robot.")
+ action_clean()
+ exit(-1)
+
logger.info("Starting installation of functest environment")
logger.info("Installing Rally...")
if not install_rally():
@@ -97,12 +103,6 @@ def action_start():
action_clean()
exit(-1)
- logger.info("Installing ODL environment...")
- if not install_odl():
- logger.error("There has been a problem while installing Robot.")
- action_clean()
- exit(-1)
-
# Create result folder under functest if necessary
if not os.path.exists(RALLY_RESULT_DIR):
os.makedirs(RALLY_RESULT_DIR)
--
cgit