diff options
| author | Steve Baker <sbaker@redhat.com> | 2016-06-15 17:07:56 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2016-06-22 10:45:04 +1200 |
| commit | 4ed43674c16aba14590d86121c0fa507e66c2597 (patch) | |
| tree | ca4b7f14d697044c2ac8b3a4b125d6ec1f75f6a1 /heat/tests/test_stack_delete.py | |
| parent | a393a4a695003c7a438acf632ac2d240e1ebb7c9 (diff) | |
| download | heat-4ed43674c16aba14590d86121c0fa507e66c2597.tar.gz | |
Be consistent about context first argument in db api
By ensuring every db api function has the context as its first
argument, this raises the possiblity of using oslo.db recommended
session handling:
http://docs.openstack.org/developer/oslo.db/usage.html#session-handling
Change-Id: I3649bdbf254e2834e79984cc381a1db1ea9e78b8
Related-Bug: #1479723
Diffstat (limited to 'heat/tests/test_stack_delete.py')
| -rw-r--r-- | heat/tests/test_stack_delete.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/heat/tests/test_stack_delete.py b/heat/tests/test_stack_delete.py index 03feaadc7..2193c5f2c 100644 --- a/heat/tests/test_stack_delete.py +++ b/heat/tests/test_stack_delete.py @@ -92,14 +92,16 @@ class StackTest(common.HeatTestCase): self.assertIsNotNone(db_s) self.assertIsNotNone(db_s.user_creds_id) user_creds_id = db_s.user_creds_id - db_creds = ucreds_object.UserCreds.get_by_id(db_s.user_creds_id) + db_creds = ucreds_object.UserCreds.get_by_id( + self.ctx, db_s.user_creds_id) self.assertIsNotNone(db_creds) self.stack.delete() db_s = stack_object.Stack.get_by_id(self.ctx, stack_id) self.assertIsNone(db_s) - db_creds = ucreds_object.UserCreds.get_by_id(user_creds_id) + db_creds = ucreds_object.UserCreds.get_by_id( + self.ctx, user_creds_id) self.assertIsNone(db_creds) del_db_s = stack_object.Stack.get_by_id(self.ctx, stack_id, @@ -122,7 +124,8 @@ class StackTest(common.HeatTestCase): self.assertIsNotNone(db_s) self.assertIsNotNone(db_s.user_creds_id) user_creds_id = db_s.user_creds_id - db_creds = ucreds_object.UserCreds.get_by_id(db_s.user_creds_id) + db_creds = ucreds_object.UserCreds.get_by_id( + self.ctx, db_s.user_creds_id) self.assertIsNotNone(db_creds) ucreds_object.UserCreds.delete(self.ctx, user_creds_id) @@ -131,7 +134,8 @@ class StackTest(common.HeatTestCase): db_s = stack_object.Stack.get_by_id(self.ctx, stack_id) self.assertIsNone(db_s) - db_creds = ucreds_object.UserCreds.get_by_id(user_creds_id) + db_creds = ucreds_object.UserCreds.get_by_id( + self.ctx, user_creds_id) self.assertIsNone(db_creds) del_db_s = stack_object.Stack.get_by_id(self.ctx, stack_id, @@ -192,7 +196,8 @@ class StackTest(common.HeatTestCase): user_creds_id = db_s.user_creds_id self.assertIsNotNone(user_creds_id) - user_creds = ucreds_object.UserCreds.get_by_id(user_creds_id) + user_creds = ucreds_object.UserCreds.get_by_id( + self.ctx, user_creds_id) self.assertEqual('thetrustor', user_creds.get('trustor_user_id')) self.stack.delete() @@ -223,7 +228,8 @@ class StackTest(common.HeatTestCase): user_creds_id = db_s.user_creds_id self.assertIsNotNone(user_creds_id) - user_creds = ucreds_object.UserCreds.get_by_id(user_creds_id) + user_creds = ucreds_object.UserCreds.get_by_id( + self.ctx, user_creds_id) self.assertEqual('thetrustor', user_creds.get('trustor_user_id')) mock_kc.return_value = fakes.FakeKeystoneClient(user_id='nottrustor') @@ -274,14 +280,16 @@ class StackTest(common.HeatTestCase): self.assertIsNotNone(db_s) user_creds_id = db_s.user_creds_id self.assertIsNotNone(user_creds_id) - user_creds = ucreds_object.UserCreds.get_by_id(user_creds_id) + user_creds = ucreds_object.UserCreds.get_by_id( + self.ctx, user_creds_id) self.assertIsNotNone(user_creds) self.stack.delete() db_s = stack_object.Stack.get_by_id(self.ctx, stack_id) self.assertIsNone(db_s) - user_creds = ucreds_object.UserCreds.get_by_id(user_creds_id) + user_creds = ucreds_object.UserCreds.get_by_id( + self.ctx, user_creds_id) self.assertIsNotNone(user_creds) self.assertEqual((stack.Stack.DELETE, stack.Stack.COMPLETE), self.stack.state) |