Merge "Remove user creation in object service and healthcheck test"
diff --git a/tempest/api/object_storage/test_healthcheck.py b/tempest/api/object_storage/test_healthcheck.py
index fdac12f..78bff03 100644
--- a/tempest/api/object_storage/test_healthcheck.py
+++ b/tempest/api/object_storage/test_healthcheck.py
@@ -16,7 +16,6 @@
from tempest.api.object_storage import base
-from tempest import clients
from tempest.common import custom_matchers
from tempest.test import attr
from tempest.test import HTTP_SUCCESS
@@ -28,37 +27,17 @@
def setUpClass(cls):
super(HealthcheckTest, cls).setUpClass()
- # creates a test user. The test user will set its base_url to the Swift
- # endpoint and test the healthcheck feature.
- cls.data.setup_test_user()
-
- cls.os_test_user = clients.Manager(
- cls.data.test_user,
- cls.data.test_password,
- cls.data.test_tenant)
-
- @classmethod
- def tearDownClass(cls):
- cls.data.teardown_all()
- super(HealthcheckTest, cls).tearDownClass()
-
def setUp(self):
super(HealthcheckTest, self).setUp()
- client = self.os_test_user.account_client
- client._set_auth()
-
+ self.account_client._set_auth()
# Turning http://.../v1/foobar into http://.../
- client.base_url = "/".join(client.base_url.split("/")[:-2])
-
- def tearDown(self):
- # clear the base_url for subsequent requests
- self.os_test_user.account_client.base_url = None
- super(HealthcheckTest, self).tearDown()
+ self.account_client.base_url = "/".join(
+ self.account_client.base_url.split("/")[:-2])
@attr('gate')
def test_get_healthcheck(self):
- resp, _ = self.os_test_user.account_client.get("healthcheck", {})
+ resp, _ = self.account_client.get("healthcheck", {})
# The status is expected to be 200
self.assertIn(int(resp['status']), HTTP_SUCCESS)
diff --git a/tempest/api/object_storage/test_object_services.py b/tempest/api/object_storage/test_object_services.py
index 256165b..13f197b 100644
--- a/tempest/api/object_storage/test_object_services.py
+++ b/tempest/api/object_storage/test_object_services.py
@@ -31,20 +31,9 @@
cls.container_client.create_container(cls.container_name)
cls.containers = [cls.container_name]
- cls.data.setup_test_user()
- resp, body = cls.token_client.auth(cls.data.test_user,
- cls.data.test_password,
- cls.data.test_tenant)
- cls.new_token = cls.token_client.get_token(cls.data.test_user,
- cls.data.test_password,
- cls.data.test_tenant)
- cls.custom_headers = {'X-Auth-Token': cls.new_token}
-
@classmethod
def tearDownClass(cls):
cls.delete_containers(cls.containers)
- # delete the user setup created
- cls.data.teardown_all()
super(ObjectTest, cls).tearDownClass()
@attr(type='smoke')