Skip to content

Commit

Permalink
Merge "Flip to pythonic method names for context unit tests"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Sep 23, 2013
2 parents f7d4f46 + 79706d5 commit 18fe2ac
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions neutron/tests/unit/test_neutron_context.py
Expand Up @@ -30,20 +30,18 @@ def setUp(self):
self.db_api_session = self._db_api_session_patcher.start()
self.addCleanup(self._db_api_session_patcher.stop)

# TODO(salv-orlando): Remove camelcase for test names in this module

def testNeutronContextCreate(self):
def test_neutron_context_create(self):
cxt = context.Context('user_id', 'tenant_id')
self.assertEqual('user_id', cxt.user_id)
self.assertEqual('tenant_id', cxt.project_id)

def testNeutronContextToDict(self):
def test_neutron_context_to_dict(self):
cxt = context.Context('user_id', 'tenant_id')
cxt_dict = cxt.to_dict()
self.assertEqual('user_id', cxt_dict['user_id'])
self.assertEqual('tenant_id', cxt_dict['project_id'])

def testNeutronContextAdminToDict(self):
def test_neutron_context_admin_to_dict(self):
self.db_api_session.return_value = 'fakesession'
cxt = context.get_admin_context()
cxt_dict = cxt.to_dict()
Expand All @@ -52,7 +50,7 @@ def testNeutronContextAdminToDict(self):
self.assertIsNotNone(cxt.session)
self.assertFalse('session' in cxt_dict)

def testNeutronContextAdminWithoutSessionToDict(self):
def test_neutron_context_admin_without_session_to_dict(self):
cxt = context.get_admin_context_without_session()
cxt_dict = cxt.to_dict()
self.assertIsNone(cxt_dict['user_id'])
Expand Down

0 comments on commit 18fe2ac

Please sign in to comment.