openstack
/
tempest
Code Issues Proposed changes

Merge "Fix update_password tests"

This commit is contained in:
Jenkins 2016-05-24 13:39:03 +00:00 committed by Gerrit Code Review
parent c808dc503b 0aa1fe1ba0
commit 22b9fec99e
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tempest/api/identity/v2/test_users.py
View File

@ -13,13 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
import copy
import time
from tempest.api.identity import base
from tempest.lib.common.utils import data_utils
from tempest.lib import exceptions
from tempest import manager
from tempest import test
@ -35,23 +33,26 @@ class IdentityUsersTest(base.BaseIdentityV2Test):
@test.idempotent_id('165859c9-277f-4124-9479-a7d1627b0ca7')
def test_user_update_own_password(self):
self.new_creds = copy.copy(self.creds.credentials)
self.new_creds.password = data_utils.rand_password()
# we need new non-admin Identity Client with new credentials, since
# current non_admin_client token will be revoked after updating
# password
self.non_admin_users_client_for_cleanup = copy.copy(
self.non_admin_users_client)
self.non_admin_users_client_for_cleanup.auth_provider = (
manager.get_auth_provider(self.new_creds))
user_id = self.creds.credentials.user_id
old_pass = self.creds.credentials.password
new_pass = self.new_creds.password
def _restore_password(client, user_id, old_pass, new_pass):
# Reset auth to get a new token with the new password
client.auth_provider.clear_auth()
client.auth_provider.credentials.password = new_pass
client.update_user_own_password(user_id, password=old_pass,
original_password=new_pass)
# Reset auth again to verify the password restore does work.
# Clear auth restores the original credentials and deletes
# cached auth data
client.auth_provider.clear_auth()
client.auth_provider.set_auth()
old_pass = self.creds.credentials.password
new_pass = data_utils.rand_password()
user_id = self.creds.credentials.user_id
# to change password back. important for allow_tenant_isolation = false
self.addCleanup(
self.non_admin_users_client_for_cleanup.update_user_own_password,
user_id, original_password=new_pass, password=old_pass)
self.addCleanup(_restore_password, self.non_admin_users_client,
user_id, old_pass=old_pass, new_pass=new_pass)
# user updates own password
self.non_admin_users_client.update_user_own_password(
user_id, password=new_pass, original_password=old_pass)

35
tempest/api/identity/v3/test_users.py
View File

@ -13,13 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
import copy
import time
from tempest.api.identity import base
from tempest.lib.common.utils import data_utils
from tempest.lib import exceptions
from tempest import manager
from tempest import test
@ -35,24 +33,25 @@ class IdentityV3UsersTest(base.BaseIdentityV3Test):
@test.idempotent_id('ad71bd23-12ad-426b-bb8b-195d2b635f27')
def test_user_update_own_password(self):
self.new_creds = copy.copy(self.creds.credentials)
self.new_creds.password = data_utils.rand_password()
# we need new non-admin Identity V3 Client with new credentials, since
# current non_admin_users_client token will be revoked after updating
# password
self.non_admin_users_client_for_cleanup = (
copy.copy(self.non_admin_users_client))
self.non_admin_users_client_for_cleanup.auth_provider = (
manager.get_auth_provider(self.new_creds))
user_id = self.creds.credentials.user_id
def _restore_password(client, user_id, old_pass, new_pass):
# Reset auth to get a new token with the new password
client.auth_provider.clear_auth()
client.auth_provider.credentials.password = new_pass
client.update_user_password(user_id, password=old_pass,
original_password=new_pass)
# Reset auth again to verify the password restore does work.
# Clear auth restores the original credentials and deletes
# cached auth data
client.auth_provider.clear_auth()
client.auth_provider.set_auth()
old_pass = self.creds.credentials.password
new_pass = self.new_creds.password
new_pass = data_utils.rand_password()
user_id = self.creds.credentials.user_id
# to change password back. important for allow_tenant_isolation = false
self.addCleanup(
self.non_admin_users_client_for_cleanup.update_user_password,
user_id,
password=old_pass,
original_password=new_pass)
self.addCleanup(_restore_password, self.non_admin_users_client,
user_id, old_pass=old_pass, new_pass=new_pass)
# user updates own password
self.non_admin_users_client.update_user_password(