commit 1e32d0ab191bfe8a8c89580b9f84fe38ded7af0a
author Mate Lakat <mate.lakat@citrix.com> Fri Dec 07 12:46:15 2012 +0000
committer Mate Lakat <mate.lakat@citrix.com> Fri Dec 07 12:46:15 2012 +0000
tree 3cabf41eadc781bb4fb76838402bd36c582dc683
parent e5f8d1228a139ae13da5f2fbdfd09b3b43fd52fd

exercises/euca: Fix volume timeout

Fixes bug 1087656

In euca exercise, the timeout for one of the volume operations was
specified as ASSOCIATE_TIMEOUT, whereas the timeout error message was
mentioning RUNNING_TIMEOUT. This fix changes the timeout to
RUNNING_TIMEOUT so that it is consistent with the error message.

As RUNNING is usually larger than ASSOCIATE, it leaves more time for the
volume operation.

Change-Id: Ic016c7920ae6e4ec9a476bb5612b7df9eed01c75

exercises/euca.sh

diff --git a/exercises/euca.sh b/exercises/euca.sh
index 67da1be..982653e 100755
--- a/exercises/euca.sh
+++ b/exercises/euca.sh
@@ -90,7 +90,7 @@
    die_if_not_set VOLUME "Failure to get volume"
 
    # Test volume has become available
-   if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ! euca-describe-volumes $VOLUME | grep -q available; do sleep 1; done"; then
+   if ! timeout $RUNNING_TIMEOUT sh -c "while ! euca-describe-volumes $VOLUME | grep -q available; do sleep 1; done"; then
        echo "volume didnt become available within $RUNNING_TIMEOUT seconds"
        exit 1
    fi