commit dfe3180c9f61762da932f72e03781dd9a564d03c
author Jenkins <jenkins@review.openstack.org> Tue Apr 25 20:28:09 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Apr 25 20:28:09 2017 +0000
tree 6349bcb56e2f3d1453082fe47ff78d3403fa50ce
parent 5f51d0955f2f02a1903979e73b92b6ddefdf02af
parent 4325015f1cdb0bcb812957275b1cfc7ea3c61f88

Merge "Consolidate resource locking with state changes"

scenario/test_aodh_alarm.py

diff --git a/scenario/test_aodh_alarm.py b/scenario/test_aodh_alarm.py
index 90288a2..49bcad9 100644
--- a/scenario/test_aodh_alarm.py
+++ b/scenario/test_aodh_alarm.py
@@ -55,3 +55,8 @@
         # Note: there is little point waiting more than 60s+time to scale up.
         self.assertTrue(test.call_until_true(
             120, 2, self.check_instance_count, stack_identifier, 2))
+
+        # Temporarily avoids a race condition, addressed in the
+        # next change https://review.openstack.org/#/c/449351/
+        import time
+        time.sleep(3)