openstack/python-keystoneclient
Code Issues Proposed changes

Change tests to pass session to Client

Browse Source 
It's deprecated to construct a Client without a session. There were
several tests that were constructing a Client without a session. So
that we can eventually remove the deprecated behavior, change these
tests to use a session.

Change-Id: Ib73d7807bb62aa84485df84b89dff4ca6956a30b
This commit is contained in:
Brant Knudson
2016-02-28 09:42:51 -06:00
parent 7d57eceb19
commit 1b3b4a8a54
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
keystoneclient/tests/unit/test_base.py
View File

@@ -10,6 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from keystoneauth1.identity import v2
from keystoneauth1 import session
from oslotest import mockpatch from oslotest import mockpatch
from keystoneclient import base from keystoneclient import base
@@ -36,11 +38,10 @@ class BaseTest(utils.TestCase):
self.assertEqual(base.getid(TmpObject), 4) self.assertEqual(base.getid(TmpObject), 4)
def test_resource_lazy_getattr(self): def test_resource_lazy_getattr(self):
# Creating a Client not using session is deprecated. auth = v2.Token(token=self.TEST_TOKEN,
with self.deprecations.expect_deprecations_here(): auth_url='http://127.0.0.1:5000')
self.client = client.Client(token=self.TEST_TOKEN, session_ = session.Session(auth=auth)
auth_url='http://127.0.0.1:5000', self.client = client.Client(session=session_)
endpoint='http://127.0.0.1:5000')
self.useFixture(mockpatch.PatchObject( self.useFixture(mockpatch.PatchObject(
self.client._adapter, 'get', side_effect=AttributeError, self.client._adapter, 'get', side_effect=AttributeError,
@@ -91,11 +92,10 @@ class ManagerTest(utils.TestCase):
def setUp(self): def setUp(self):
super(ManagerTest, self).setUp() super(ManagerTest, self).setUp()
# Creating a Client not using session is deprecated. auth = v2.Token(auth_url='http://127.0.0.1:5000',
with self.deprecations.expect_deprecations_here(): token=self.TEST_TOKEN)
self.client = client.Client(token=self.TEST_TOKEN, session_ = session.Session(auth=auth)
auth_url='http://127.0.0.1:5000', self.client = client.Client(session=session_)
endpoint='http://127.0.0.1:5000')
self.mgr = base.Manager(self.client) self.mgr = base.Manager(self.client)
self.mgr.resource_class = base.Resource self.mgr.resource_class = base.Resource