Fixes failing test introduced after disabled check remove.

Also includes some cleanup in UpdateUsers test class.

2 files changed, 21 insertions, 20 deletions

diff --git a/keystone/test/unit/test_common.py b/keystone/test/unit/test_common.py
index 9bb33608..b6eb313c 100755
--- a/keystone/test/unit/test_common.py
+++ b/keystone/test/unit/test_common.py
@@ -331,6 +331,16 @@ def add_user_json(auth_token):
     return (resp, content)
 
 
+def user_set_enabled(auth_token, user_id, enabled):
+    header = httplib2.Http(".cache")
+    url = '%susers/%s/enabled' % (URL_V2, user_id)
+    data = '{"user": { "enabled": %s}}' % ("true" if enabled else "false")
+    resp, content = header.request(url, "PUT", body=data,
+                              headers={"Content-Type": "application/json",
+                                       "X-Auth-Token": auth_token})
+    return (resp, content)
+
+
 def user_update_json(auth_token, user_id, email=None):
     header = httplib2.Http(".cache")
     url = '%susers/%s' % (URL_V2, user_id)
diff --git a/keystone/test/unit/test_users.py b/keystone/test/unit/test_users.py
index 0bf411a2..e57f75b3 100755
--- a/keystone/test/unit/test_users.py
+++ b/keystone/test/unit/test_users.py
@@ -806,8 +806,14 @@ class GetUsersGroupTest(UserTest):
 
 class UpdateUserTest(UserTest):
 
-    def test_user_update(self):
+    def setUp(self):
+        super(UpdateUserTest, self).setUp()
         utils.create_user(self.tenant, self.user, str(self.auth_token))
+
+    def tearDown(self):
+        super(UpdateUserTest, self).tearDown()
+
+    def test_user_update(self):
         resp, content = utils.user_update_json(self.auth_token, self.user)
         resp_val = int(resp['status'])
         content = json.loads(content)
@@ -815,13 +821,11 @@ class UpdateUserTest(UserTest):
             self.fail('Identity Fault')
         elif resp_val == 503:
             self.fail('Service Not Available')
-        utils.delete_user(self.user, str(self.auth_token))
         self.assertEqual(200, resp_val)
         self.assertEqual('updatedjoeuser@openstack.org',
                          content['user']['email'])
 
     def test_user_update_xml(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_xml(self.auth_token, self.user)
         resp_val = int(resp['status'])
         content = etree.fromstring(content)
@@ -829,16 +833,15 @@ class UpdateUserTest(UserTest):
             self.fail('Identity Fault')
         elif resp_val == 503:
             self.fail('Service Not Available')
-        utils.delete_user(self.user, str(self.auth_token))
         self.assertEqual(200, resp_val)
         self.assertEqual('updatedjoeuser@openstack.org',
                           content.get("email"))
         self.assertEqual('application/xml', utils.content_type(resp))
 
     def test_user_update_user_disabled(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
+        utils.user_set_enabled(self.auth_token, self.user, False)
         resp, content = utils.user_update_json(self.auth_token,
-                                               self.userdisabled)
+                                               self.user)
         resp_val = int(resp['status'])
         content = json.loads(content)
         if resp_val == 500:
@@ -848,9 +851,9 @@ class UpdateUserTest(UserTest):
         self.assertEqual(200, resp_val)
 
     def test_user_update_user_disabled_xml(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
+        utils.user_set_enabled(self.auth_token, self.user, False)
         resp, content = utils.user_update_xml(self.auth_token,
-                                              self.userdisabled)
+                                              self.user)
         resp_val = int(resp['status'])
         content = etree.fromstring(content)
         if resp_val == 500:
@@ -861,7 +864,6 @@ class UpdateUserTest(UserTest):
         self.assertEqual('application/xml', utils.content_type(resp))
 
     def test_user_update_email_conflict(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_json(self.auth_token,
                                                 "joeuser",
                                                 "test_user@openstack.org")
@@ -874,7 +876,6 @@ class UpdateUserTest(UserTest):
         self.assertEqual(409, resp_val)
 
     def test_user_update_email_conflict_xml(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_xml(self.auth_token,
                                               "joeuser",
                                               "test_user@openstack.org")
@@ -902,7 +903,6 @@ class UpdateUserTest(UserTest):
             self.fail('Identity Fault')
         elif resp_val == 503:
             self.fail('Service Not Available')
-        utils.delete_user(self.user, str(self.auth_token))
         self.assertEqual(400, resp_val)
 
     def test_user_update_bad_request_xml(self):
@@ -923,12 +923,10 @@ class UpdateUserTest(UserTest):
             self.fail('Identity Fault')
         elif resp_val == 503:
             self.fail('Service Not Available')
-        utils.delete_user(self.user, str(self.auth_token))
         self.assertEqual(400, resp_val)
         self.assertEqual('application/xml', utils.content_type(resp))
 
     def test_user_update_expired_token(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_json(self.exp_auth_token,
                                                self.user)
         resp_val = int(resp['status'])
@@ -940,7 +938,6 @@ class UpdateUserTest(UserTest):
         self.assertEqual(403, resp_val)
 
     def test_user_update_expired_token_xml(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_xml(self.exp_auth_token,
                                               self.user)
         resp_val = int(resp['status'])
@@ -953,7 +950,6 @@ class UpdateUserTest(UserTest):
         self.assertEqual('application/xml', utils.content_type(resp))
 
     def test_user_update_disabled_token(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_json(self.disabled_token
                                                , self.user)
         resp_val = int(resp['status'])
@@ -965,7 +961,6 @@ class UpdateUserTest(UserTest):
         self.assertEqual(403, resp_val)
 
     def test_user_update_disabled_token_xml(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_xml(self.disabled_token
                                               , self.user)
         resp_val = int(resp['status'])
@@ -978,7 +973,6 @@ class UpdateUserTest(UserTest):
         self.assertEqual('application/xml', utils.content_type(resp))
 
     def test_user_update_invalid_token(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_json(self.invalid_token,
                                                self.user)
         resp_val = int(resp['status'])
@@ -990,7 +984,6 @@ class UpdateUserTest(UserTest):
         self.assertEqual(404, resp_val)
 
     def test_user_update_invalid_token_xml(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_xml(self.invalid_token, self.user)
         resp_val = int(resp['status'])
         content = etree.fromstring(content)
@@ -1002,7 +995,6 @@ class UpdateUserTest(UserTest):
         self.assertEqual('application/xml', utils.content_type(resp))
 
     def test_user_update_missing_token(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_json(self.missing_token, self.user)
         resp_val = int(resp['status'])
         content = json.loads(content)
@@ -1013,7 +1005,6 @@ class UpdateUserTest(UserTest):
         self.assertEqual(401, resp_val)
 
     def test_user_update_missing_token_xml(self):
-        utils.create_user(self.tenant, self.user, str(self.auth_token))
         resp, content = utils.user_update_xml(self.missing_token,
                                               self.user)
         resp_val = int(resp['status'])