summaryrefslogtreecommitdiff
path: root/functionaltests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-21 21:16:41 +0000
committerGerrit Code Review <review@openstack.org>2015-05-21 21:16:41 +0000
commit5f1a164c8986ab925bf5fd41f23e95175d63a222 (patch)
treecb21a9666194f27db85a25ef25fb4d36f5dc5134 /functionaltests
parent32c6c74b3cd46667745014e18ea5b8bcbd27f650 (diff)
parent4c4b8e8025cd4012d5bf7879061b63d9e13e2f4f (diff)
downloadpython-barbicanclient-5f1a164c8986ab925bf5fd41f23e95175d63a222.tar.gz
Merge "Remove instances of _base_url"
Diffstat (limited to 'functionaltests')
-rw-r--r--functionaltests/client/v1/behaviors/base_behaviors.py2
-rw-r--r--functionaltests/client/v1/functional/test_containers.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/functionaltests/client/v1/behaviors/base_behaviors.py b/functionaltests/client/v1/behaviors/base_behaviors.py
index 9192f98..da642dd 100644
--- a/functionaltests/client/v1/behaviors/base_behaviors.py
+++ b/functionaltests/client/v1/behaviors/base_behaviors.py
@@ -23,7 +23,7 @@ class BaseBehaviors(object):
self.LOG = logging.getLogger(type(self).__name__)
self.client = client
self.created_entities = []
- self.base_url = client.secrets._api._base_url
+ self.base_url = client.secrets._api.endpoint_override
def get_json(self, response):
json_data = dict()
diff --git a/functionaltests/client/v1/functional/test_containers.py b/functionaltests/client/v1/functional/test_containers.py
index 2c7c284..a721c28 100644
--- a/functionaltests/client/v1/functional/test_containers.py
+++ b/functionaltests/client/v1/functional/test_containers.py
@@ -186,7 +186,7 @@ class GenericContainersTestCase(BaseContainersTestCase):
This should return a 404.
"""
uuid = 'de305d54-75b4-431b-cccc-eb6b9e546013'
- base_url = self.barbicanclient.secrets._api._base_url
+ base_url = self.behaviors.base_url
url = base_url + '/containers/' + uuid
e = self.assertRaises(