commit 357295d5c62456f2470edab9eedf601d10d58871
author Jenkins <jenkins@review.openstack.org> Wed Feb 05 02:54:37 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Feb 05 02:54:37 2014 +0000
tree 9f867bac8f5fb611fca96791f0d756d84e01b6ec
parent 9f5c796ff065dbc910c21ecb3ded4b45f6529486
parent a1598bad68c718604d6b7e413d8d2ebd1d91c6e3

Merge "Correctly call client inits from test_multi_backend"

tempest/api/volume/admin/test_multi_backend.py

diff --git a/tempest/api/volume/admin/test_multi_backend.py b/tempest/api/volume/admin/test_multi_backend.py
index 96e0264..cb1a6cb 100644
--- a/tempest/api/volume/admin/test_multi_backend.py
+++ b/tempest/api/volume/admin/test_multi_backend.py
@@ -41,13 +41,11 @@
         adm_tenant = CONF.identity.admin_tenant_name
         auth_url = CONF.identity.uri
 
-        cls.volume_client = volumes_client.VolumesClientJSON(CONF,
-                                                             adm_user,
+        cls.volume_client = volumes_client.VolumesClientJSON(adm_user,
                                                              adm_pass,
                                                              auth_url,
                                                              adm_tenant)
-        cls.type_client = volume_types_client.VolumeTypesClientJSON(CONF,
-                                                                    adm_user,
+        cls.type_client = volume_types_client.VolumeTypesClientJSON(adm_user,
                                                                     adm_pass,
                                                                     auth_url,
                                                                     adm_tenant)