From 38590dd5c16c71898d9450f22a59a6910b13109f Mon Sep 17 00:00:00 2001 From: Monsyne Dragon Date: Tue, 26 Aug 2014 16:01:14 +0000 Subject: [PATCH] Fix nondeterministic test ordering bug. Fix a unit test bug. Fix was in rackerlabs repo, but somehow never made it to stackforge. Change-Id: Ie8a056e553f7385b335771ede1de1c2a8c01ae7a --- tests/unit/test_dbapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_dbapi.py b/tests/unit/test_dbapi.py index 5c2da62..96aa9ef 100644 --- a/tests/unit/test_dbapi.py +++ b/tests/unit/test_dbapi.py @@ -506,7 +506,7 @@ class DBAPITestCase(StacktachBaseTestCase): fake_request.body = body info_values = self.mox.CreateMockAnything() - models.TenantInfo.objects.filter(tenant__in=['test_old', 'test_new']).AndReturn(info_values) + models.TenantInfo.objects.filter(tenant__in=mox.SameElementsAs(['test_old', 'test_new'])).AndReturn(info_values) info_values.values('tenant').AndReturn([dict(tenant='test_old')]) models.TenantInfo.objects.bulk_create(mox.And( Length(1), mox.IsA(list), mox.In(mox.And( @@ -517,7 +517,7 @@ class DBAPITestCase(StacktachBaseTestCase): )))) fake_tenants = self.mox.CreateMockAnything() - models.TenantInfo.objects.filter(tenant__in=['test_old', 'test_new'])\ + models.TenantInfo.objects.filter(tenant__in=mox.SameElementsAs(['test_old', 'test_new']))\ .AndReturn(fake_tenants) fake_tenants.update(last_updated=TEST_DATE) fake_tenants.__iter__().AndReturn(iter(TEST_OBJECTS))