diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-16 18:14:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-16 18:14:26 +0000 |
| commit | a331a5e8b77a22dbebd4c0e16b42caba827d65d0 (patch) | |
| tree | e241e03598910ce62e36ec96ed70b1aa547a5e18 | |
| parent | 4ba7e7bc9c71b88e488c9ab4bdf9178a62e1deea (diff) | |
| parent | f47379bba1d40518de4daff496b00a96255f0ef0 (diff) | |
| download | keystone-a331a5e8b77a22dbebd4c0e16b42caba827d65d0.tar.gz keystone-a331a5e8b77a22dbebd4c0e16b42caba827d65d0.tar.xz keystone-a331a5e8b77a22dbebd4c0e16b42caba827d65d0.zip | |
Merge "Fixed some skipped tests"
| -rw-r--r-- | keystone/test/unit/test_auth.py | 6 | ||||
| -rw-r--r-- | keystone/test/unit/test_d5_compat.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/keystone/test/unit/test_auth.py b/keystone/test/unit/test_auth.py index 0c70f3ed..458873e7 100644 --- a/keystone/test/unit/test_auth.py +++ b/keystone/test/unit/test_auth.py @@ -29,7 +29,7 @@ class TestAuth(unittest.TestCase): self.assertIsNone(creds.tenant_id) self.assertIsNone(creds.tenant_name) - def test_pwd_creds_with_tenant_from_json(self): + def test_pwd_creds_with_tenant_name_from_json(self): data = json.dumps({"auth": {"tenantName": "blaa", "passwordCredentials": @@ -40,7 +40,7 @@ class TestAuth(unittest.TestCase): self.assertIsNone(creds.tenant_id) self.assertEqual(creds.tenant_name, "blaa") - def test_pwd_creds_with_tenant_from_json(self): + def test_pwd_creds_with_tenant_id_from_json(self): data = json.dumps({"auth": {"tenantId": "blaa", "passwordCredentials": @@ -176,7 +176,7 @@ class TestAuth(unittest.TestCase): auth.AuthWithUnscopedToken.from_json, data) - def test_token_invalid_attribute_from_json(self): + def test_token_invalid_token_attribute_from_json(self): data = json.dumps({"auth": {"token": {"bar": "foo"}}}) self.assertRaisesRegexp(fault.BadRequestFault, "Invalid", diff --git a/keystone/test/unit/test_d5_compat.py b/keystone/test/unit/test_d5_compat.py index 6b33b0a3..1b7d0191 100644 --- a/keystone/test/unit/test_d5_compat.py +++ b/keystone/test/unit/test_d5_compat.py @@ -36,7 +36,7 @@ class TestD5Auth(unittest.TestCase): self.assertIsNone(creds.tenant_id) self.assertIsNone(creds.tenant_name) - def test_pwd_creds_with_tenant_from_json(self): + def test_pwd_creds_with_tenant_name_from_json(self): data = json.dumps({"passwordCredentials": {"tenantName": "blaa", "username": "foo", "password": "bar"}}) @@ -46,7 +46,7 @@ class TestD5Auth(unittest.TestCase): self.assertIsNone(creds.tenant_id) self.assertEqual(creds.tenant_name, "blaa") - def test_pwd_creds_with_tenant_from_json(self): + def test_pwd_creds_with_tenant_id_from_json(self): data = json.dumps({"passwordCredentials": {"tenantId": "blaa", "username": "foo", "password": "bar"}}) |