From 3860a9252a8546326a7ac9f0c8b2c09afe655491 Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Mon, 14 Jan 2013 13:14:34 +0100 Subject: [PATCH] Have ecua.sh to accept the correct error code ecua.sh will accept both the current and the correct error code Change-Id: I364e411986b9780fd5c5df29697753f04a9a4935 --- exercises/euca.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/euca.sh b/exercises/euca.sh index 76df254b45..46e40251aa 100755 --- a/exercises/euca.sh +++ b/exercises/euca.sh @@ -169,7 +169,7 @@ euca-terminate-instances $INSTANCE || \ # case changed with bug/836978. Requesting the status of an invalid instance # will now return an error message including the instance id, so we need to # filter that out. -if ! timeout $TERMINATE_TIMEOUT sh -c "while euca-describe-instances $INSTANCE |grep -v \"InstanceNotFound\" | grep -q $INSTANCE; do sleep 1; done"; then +if ! timeout $TERMINATE_TIMEOUT sh -c "while euca-describe-instances $INSTANCE | grep -ve \"\\\(InstanceNotFound\\\|InvalidInstanceId\[.\]NotFound\\\)\" | grep -q $INSTANCE; do sleep 1; done"; then echo "server didn't terminate within $TERMINATE_TIMEOUT seconds" exit 1 fi