openstack/trove
Code Issues Proposed changes

Merge "Remove flaky assert from TestMgmtInstanceDeleted test"

Browse Source
This commit is contained in:
Jenkins
2015-03-20 14:27:27 +00:00
committed by Gerrit Code Review
parent 71376d4e48 5e3c0fbb77
commit 7cdc493441
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
trove/tests/unittests/mgmt/test_models.py
View File

@@ -401,11 +401,13 @@ class TestMgmtInstanceDeleted(MockMgmtInstanceTest):
args = {'deleted': 1, 'cluster_id': None} args = {'deleted': 1, 'cluster_id': None}
db_infos_deleted = DBInstance.find_all(**args) db_infos_deleted = DBInstance.find_all(**args)
args = {'cluster_id': None} args = {'cluster_id': None}
db_infos_all = DBInstance.find_all(**args) # db_infos_all = DBInstance.find_all(**args)
self.assertTrue(db_infos_all.count() == # TODO(SlickNik) Fix this assert to work reliably in the gate.
db_infos_active.count() + # This fails intermittenly when the unit tests run in parallel.
db_infos_deleted.count()) # self.assertTrue(db_infos_all.count() ==
# db_infos_active.count() +
# db_infos_deleted.count())
with patch.object(self.context, 'is_admin', return_value=True): with patch.object(self.context, 'is_admin', return_value=True):
deleted_instance = db_infos_deleted.all()[0] deleted_instance = db_infos_deleted.all()[0]