Merge "Aggregate functional test tweak"

Author: Zuul

openstackclient/tests/functional/compute/v2/test_aggregate.py

@@ -54,9 +54,10 @@ def test_aggregate_create_and_delete(self):
 
         # Loop a few times since this is timing-sensitive
         # Just hard-code it for now, since there is no pause and it is
-        # racy we shouldn't have to wait too long, a minute seems reasonable
+        # racy we shouldn't have to wait too long, a minute or two
+        # seems reasonable
         wait_time = 0
-        while wait_time < 60:
+        while wait_time <= 120:
             cmd_output = json.loads(self.openstack(
                 'aggregate show -f json ' +
                 name2