commit f756470f0d3eb69668dc6fc9f0bb117d26d644d8
author Jenkins <jenkins@review.openstack.org> Fri Jun 14 16:15:06 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jun 14 16:15:06 2013 +0000
tree bc83a343a2547d43c0eceb062cbf3e8b72a01eed
parent c3771456323126b03116bc58ec1579ba888ca132
parent 63a71a231638b8ed3390d04b986b8db177e4ab13

Merge "Ensure flavor_ref_alt is different from flavor_ref"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index ac9c8b4..e3faa2e 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -167,9 +167,15 @@
         fi
         flavor_ref=${flavors[0]}
         flavor_ref_alt=$flavor_ref
-        if [[ $num_flavors -gt 1 ]]; then
-            flavor_ref_alt=${flavors[1]}
-        fi
+
+        # ensure flavor_ref and flavor_ref_alt have different values
+        # some resize instance in tempest tests depends on this.
+        for f in ${flavors[@]:1}; do
+            if [[ $f -ne $flavor_ref ]]; then
+                flavor_ref_alt=$f
+                break
+            fi
+        done
     fi
 
     if [ "$Q_USE_NAMESPACE" != "False" ]; then