summaryrefslogtreecommitdiff
path: root/designateclient
diff options
context:
space:
mode:
authorPaul Glass <paul.glass@rackspace.com>2016-04-07 14:54:32 +0000
committerPaul Glass <paul.glass@rackspace.com>2016-04-08 16:00:44 +0000
commit7b1caa5944cb8aeeee44386cd1f0c802e01207db (patch)
tree0131ceb71245ed4ae19cb6f7e20ac2600311f4ab /designateclient
parenta9385ac8f55560e73ab5d35e95b5c4c143474c26 (diff)
downloadpython-designateclient-7b1caa5944cb8aeeee44386cd1f0c802e01207db.tar.gz
Fix a race condition in one of the zone import tests
This test would occasionally fail if the import was still PENDING when the check asserted a COMPLETED status. Change-Id: Ia2c320d50dd061980c27b0b7ec0cb6c65c13f6e7
Diffstat (limited to 'designateclient')
-rw-r--r--designateclient/functionaltests/v2/test_zone_import.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/designateclient/functionaltests/v2/test_zone_import.py b/designateclient/functionaltests/v2/test_zone_import.py
index 232b57f..51c9906 100644
--- a/designateclient/functionaltests/v2/test_zone_import.py
+++ b/designateclient/functionaltests/v2/test_zone_import.py
@@ -47,7 +47,9 @@ class TestZoneImport(BaseDesignateTest):
self.assertEqual(zone_import.id, fetched_import.id)
self.assertEqual(zone_import.project_id, fetched_import.project_id)
- self.assertEqual('COMPLETE', fetched_import.status)
+ # check both statuses to avoid a race condition, causing test failure.
+ # we don't know when the import completes.
+ self.assertIn(fetched_import.status, ['PENDING', 'COMPLETE'])
def test_delete_zone_import(self):
zone_import = self.useFixture(ImportFixture(