summaryrefslogtreecommitdiffstats
path: root/testcases/config_functest.py
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2015-09-01 09:53:19 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-09-01 09:53:20 +0000
commit55c1cf75d7315e550c8e97692f6c35ff159d7c12 (patch)
tree22eed3cad2dbca590c27dda1a0396a6c03a2c69b /testcases/config_functest.py
parent3f65dc2c849c8368ae6867de1075ef69dba3e656 (diff)
parent75124a19a187242f57b4b4e0267e40a0b11cbfdf (diff)
Merge changes I9d9ad0d9,Ifebcbcda
* changes: workaround order of env settings to all ODL tests to be run README for vIMS testcase Note that vIMS shall be also documented in the global functest rst guideline.
Diffstat (limited to 'testcases/config_functest.py')
-rw-r--r--testcases/config_functest.py12
1 files changed, 6 insertions, 6 deletions
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)