From e0fd004771038f5d77a3b3fef4e38f11874b24f1 Mon Sep 17 00:00:00 2001 From: Bryan Sullivan Date: Sun, 29 Jan 2017 12:10:53 -0800 Subject: Remove strange lines that creeped in somehow JIRA: MODELS-23 Change-Id: Iecddf7c197c27750b434f2976271a5cd6d17c843 Signed-off-by: Bryan Sullivan --- tests/vHello_Tacker.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/vHello_Tacker.sh b/tests/vHello_Tacker.sh index 3853614..5319092 100644 --- a/tests/vHello_Tacker.sh +++ b/tests/vHello_Tacker.sh @@ -258,7 +258,6 @@ start() { echo "$0: $(date) verify vHello server is running" apt-get install -y curl -<<<<<<< HEAD count=12 while [[ $(curl $SERVER_URL | grep -c "Hello World") == 0 ]] do @@ -267,9 +266,7 @@ start() { done if [[ $(curl $SERVER_URL | grep -c "Hello World") == 0 ]]; then fail; fi assert "models-vhello-001 (vHello VNF creation)" true -======= assert "models-vhello-001 (vHello VNF creation)" [[ $(curl $SERVER_URL | grep -c "Hello World") > 0 ]] ->>>>>>> 26abbf6... Fix assertions assert "models-tacker-003 (VNF creation)" true assert "models-tacker-vnfd-002 (artifacts creation)" true assert "models-tacker-vnfd-003 (user_data creation)" true -- cgit 1.2.3-korg