From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Wed, 21 Jun 2017 12:55:01 +0000 (+0200)
Subject: Fix command in prepare env to execute check_os.sh
X-Git-Tag: 0.2~561
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4d669670f13e5ab4394a2c9e38073bf7281555ae;p=functest-xtesting.git

Fix command in prepare env to execute check_os.sh

[1] introduced a bug when adding "sh" to the call.
There is no need to use sh or bash in the command string.

[1]: https://gerrit.opnfv.org/gerrit/#/c/36163/

Change-Id: I9ce443721b69945a4a749da0caa6c008cc8ca284
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index fd1f5dbf..5326c50b 100755
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -251,8 +251,8 @@ def update_db_url():
 def verify_deployment():
     print_separator()
     logger.info("Verifying OpenStack services...")
-    cmd = ("sh %s" % pkg_resources.resource_filename(
-        'functest', 'ci/check_os.sh'))
+    cmd = ("%s" % pkg_resources.resource_filename(
+           'functest', 'ci/check_os.sh'))
 
     logger.debug("Executing command: %s" % cmd)
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)