diff options
| author |   Bryan Sullivan <bryan.sullivan@att.com> | 2017-01-29 12:10:53 -0800 |
|---|---|---|
| committer | Bryan Sullivan <bryan.sullivan@att.com> | 2017-01-29 12:10:53 -0800 |
| commit | e0fd004771038f5d77a3b3fef4e38f11874b24f1 (patch) | |
| tree | 79760de2e2e1997bf8c9884d310858eda7192bd8 /tests | |
| parent | 72a7c789343c7f1643df82e83578363b5de95845 (diff) | |
Remove strange lines that creeped in somehow
JIRA: MODELS-23
Change-Id: Iecddf7c197c27750b434f2976271a5cd6d17c843
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vHello_Tacker.sh | 3 |
1 files changed, 0 insertions, 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 |