Browse code

Merge "Correct InvalidInstanceID.NotFound test."

Jenkins authored on 2013/06/12 07:34:40
Showing 1 changed files
... ...
@@ -162,7 +162,7 @@ euca-terminate-instances $INSTANCE || \
162 162
 # case changed with bug/836978. Requesting the status of an invalid instance
163 163
 # will now return an error message including the instance id, so we need to
164 164
 # filter that out.
165
-if ! timeout $TERMINATE_TIMEOUT sh -c "while euca-describe-instances $INSTANCE | grep -ve \"\\\(InstanceNotFound\\\|InvalidInstanceID\[.\]NotFound\\\)\" | grep -q $INSTANCE; do sleep 1; done"; then
165
+if ! timeout $TERMINATE_TIMEOUT sh -c "while euca-describe-instances $INSTANCE | grep -ve '\(InstanceNotFound\|InvalidInstanceID\.NotFound\)' | grep -q $INSTANCE; do sleep 1; done"; then
166 166
     die $LINENO "server didn't terminate within $TERMINATE_TIMEOUT seconds"
167 167
 fi
168 168