openstack/devstack
Code Issues Proposed changes

Correct InvalidInstanceID.NotFound test.

Browse Source 
* exercises/euca.sh: The match filtering InvalidInstanceID.NotFound
is cleaned up to eliminate numerous leaning toothpicks, and now also
actually works. The previous version was incorporating literal
square brackets into the pattern where I think a character list
match may have been intended instead, but was not actually necessary
anyway.

Change-Id: I765a20000e7b6ba6deadce8cad3bbc9559fcdd0d
This commit is contained in:
Jeremy Stanley 2013-06-10 00:23:38 +00:00
parent 5695a9ecd7
commit 18b0906e1f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exercises/euca.sh
View File

@ -162,7 +162,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 -ve \"\\\(InstanceNotFound\\\|InvalidInstanceID\[.\]NotFound\\\)\" | 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
die $LINENO "server didn't terminate within $TERMINATE_TIMEOUT seconds"
fi