summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorboucherv <valentin.boucher@orange.com>2016-04-01 11:53:40 +0200
committerboucherv <valentin.boucher@orange.com>2016-04-01 11:53:40 +0200
commitdd53e7733fc6a3f64b3ee5c34e79d37821a3f9f6 (patch)
tree858e101d5e846a7654772432ce0d5dc91c79c1ba
parent56474387253f74f45222f11455477be011e58a60 (diff)
bugfix single quote
Change-Id: I3391b9a3d0dd84402b7d2b588b9611a8035966d7
-rw-r--r--testcases/vIMS/CI/vIMS.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py
index dbd98fa8d..290dc982d 100644
--- a/testcases/vIMS/CI/vIMS.py
+++ b/testcases/vIMS/CI/vIMS.py
@@ -156,10 +156,9 @@ def set_result(step_name, duration=0, result=""):
def test_clearwater():
-
script = "source " + VIMS_DATA_DIR + "venv_cloudify/bin/activate; "
script += "cd " + VIMS_DATA_DIR + "; "
- script += "cfy status | grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}'"
+ script += "cfy status | grep -Eo \"([0-9]{1,3}\.){3}[0-9]{1,3}\""
cmd = "/bin/bash -c '" + script + "'"
try:
@@ -167,7 +166,7 @@ def test_clearwater():
mgr_ip = os.popen(cmd).read()
mgr_ip = mgr_ip.splitlines()[0]
except:
- logger.error("Unable to retrieve the IP of the cloudify manager server !")
+ step_failure("sig_test", "Unable to retrieve the IP of the cloudify manager server !")
api_url = "http://" + mgr_ip + "/api/v2"
dep_outputs = requests.get(api_url + "/deployments/" + CW_DEPLOYMENT_NAME + "/outputs")