1 files changed, 9 insertions, 6 deletions
diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index 64fcc925..ae9d9537 100755
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -251,8 +251,7 @@ def update_db_url():
 def verify_deployment():
     print_separator()
     logger.info("Verifying OpenStack services...")
-    cmd = ("%s" % pkg_resources.resource_filename(
-           'functest', 'ci/check_os.sh'))
+    cmd = "check_os.sh"
 
     logger.debug("Executing command: %s" % cmd)
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
@@ -261,7 +260,7 @@ def verify_deployment():
         line = p.stdout.readline().rstrip()
         if "ERROR" in line:
             logger.error(line)
-            raise Exception("Problem while running 'check_os.sh'.")
+            raise Exception("Problem while running '{}'.".format(cmd))
         logger.info(line)
 
 
@@ -358,7 +357,7 @@ def print_deployment_info():
                     handler.get_deployment_info())
 
 
-def main(**kwargs):
+def prepare_env(**kwargs):
     try:
         if not (kwargs['action'] in actions):
             logger.error('Argument not valid.')
@@ -384,9 +383,13 @@ def main(**kwargs):
     return 0
 
 
-if __name__ == '__main__':
+def main():
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
     parser = PrepareEnvParser()
     args = parser.parse_args(sys.argv[1:])
-    sys.exit(main(**args))
+    return prepare_env(**args)
+
+
+if __name__ == '__main__':
+    sys.exit(main())