summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2016-07-28 16:52:29 +0200
committerJulien Danjou <julien@danjou.info>2016-07-28 16:53:43 +0200
commit6ca1f270fdc8f04309577c2a9966cf9826595c3e (patch)
tree4b948fc006c43cd723ec1dfc76daef19c4a7a823
parentf0faf477afe22f691e586900dcd8abaaccbb767c (diff)
downloadpython-ceilometerclient-6ca1f270fdc8f04309577c2a9966cf9826595c3e.tar.gz
Remove keystoneclient dependency
Change-Id: I3589eca8fd6a581e57524cffa8a8f1278358f38c
-rw-r--r--ceilometerclient/tests/unit/fakes.py64
-rw-r--r--ceilometerclient/tests/unit/test_client.py3
-rw-r--r--requirements.txt1
3 files changed, 0 insertions, 68 deletions
diff --git a/ceilometerclient/tests/unit/fakes.py b/ceilometerclient/tests/unit/fakes.py
deleted file mode 100644
index 10d8d8c..0000000
--- a/ceilometerclient/tests/unit/fakes.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-from keystoneclient.v2_0 import client as ksclient
-
-
-def script_keystone_client():
- ksclient.Client(auth_url='http://no.where',
- insecure=False,
- password='password',
- tenant_id='',
- tenant_name='tenant_name',
- username='username').AndReturn(FakeKeystone('abcd1234'))
-
-
-def fake_headers():
- return {'X-Auth-Token': 'abcd1234',
- 'Content-Type': 'application/json',
- 'Accept': 'application/json',
- 'User-Agent': 'python-ceilometerclient'}
-
-
-class FakeServiceCatalog(object):
- @staticmethod
- def url_for(endpoint_type, service_type):
- return 'http://192.168.1.5:8004/v1/f14b41234'
-
-
-class FakeKeystone(object):
- service_catalog = FakeServiceCatalog()
-
- def __init__(self, auth_token):
- self.auth_token = auth_token
-
-
-class FakeHTTPResponse(object):
-
- version = 1.1
-
- def __init__(self, status, reason, headers, body):
- self.headers = headers
- self.body = body
- self.status = status
- self.reason = reason
-
- def getheader(self, name, default=None):
- return self.headers.get(name, default)
-
- def getheaders(self):
- return self.headers.items()
-
- def read(self, amt=None):
- b = self.body
- self.body = None
- return b
diff --git a/ceilometerclient/tests/unit/test_client.py b/ceilometerclient/tests/unit/test_client.py
index 174037b..e8a1eb5 100644
--- a/ceilometerclient/tests/unit/test_client.py
+++ b/ceilometerclient/tests/unit/test_client.py
@@ -22,7 +22,6 @@ import requests
from ceilometerclient import client
from ceilometerclient import exc
from ceilometerclient.openstack.common.apiclient import exceptions
-from ceilometerclient.tests.unit import fakes
from ceilometerclient.tests.unit import utils
from ceilometerclient.v2 import client as v2client
@@ -77,7 +76,6 @@ class ClientTest(utils.BaseTestCase):
c2 = self.create_client(env)
self.assertIsInstance(c2, v2client.Client)
- @mock.patch('keystoneclient.v2_0.client', fakes.FakeKeystone)
def test_client_without_auth_plugin(self):
env = FAKE_ENV.copy()
del env['auth_plugin']
@@ -201,7 +199,6 @@ class ClientTestWithAodh(ClientTest):
return_value=mock.MagicMock()):
return client.get_client(api_version, **env)
- @mock.patch('keystoneclient.v2_0.client', fakes.FakeKeystone)
def test_client_without_auth_plugin(self):
env = FAKE_ENV.copy()
del env['auth_plugin']
diff --git a/requirements.txt b/requirements.txt
index a026806..51fc204 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,6 @@ oslo.i18n>=2.1.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.5.0 # Apache-2.0
PrettyTable<0.8,>=0.7 # BSD
-python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
requests!=2.9.0,>=2.8.1 # Apache-2.0
six>=1.9.0 # MIT
stevedore>=1.10.0 # Apache-2.0