diff options
| author | sirish.bitra <sirish.bitra@gmail.com> | 2011-05-11 19:06:36 +0530 |
|---|---|---|
| committer | sirish.bitra <sirish.bitra@gmail.com> | 2011-05-11 19:06:36 +0530 |
| commit | b7214f4d30f099ac2ebdc8ccbe7ecd843303963c (patch) | |
| tree | aade311ae9c7c2a515fcac12f5939ad21742b877 /test | |
| parent | fa0fc94facd1c8ce976693a61ffcb197f61f8c81 (diff) | |
| parent | fdc8f67be79cf399235f7a272176081061e0d588 (diff) | |
Merge branch 'master' of https://git.hcleai.com/keystone
test fixes
Conflicts:
keystone.log
test/unit/test_identity.py
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/test_identity.py | 2 | ||||
| -rw-r--r-- | test/unit/test_token.py | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/test/unit/test_identity.py b/test/unit/test_identity.py index b3431deb..ea47667a 100644 --- a/test/unit/test_identity.py +++ b/test/unit/test_identity.py @@ -2,7 +2,6 @@ import logging import os import unittest from lxml import etree - MODULE_EXTENSIONS = set('.py'.split()) def unit_test_extractor(tup, path, filenames): @@ -49,6 +48,5 @@ if __name__ == '__main__': logging.basicConfig(level=logging.WARN) package_path = os.path.dirname(os.path.abspath(__file__)) suites = get_test_suites(package_path) - #print suites for suite in suites: unittest.TextTestRunner(verbosity=1).run(suite) diff --git a/test/unit/test_token.py b/test/unit/test_token.py index 88bb0048..5ce9d913 100644 --- a/test/unit/test_token.py +++ b/test/unit/test_token.py @@ -14,7 +14,7 @@ from test_common import * class validate_token(unittest.TestCase): - + def setUp(self): self.token = get_token('joeuser', 'secrete', 'token') self.tenant = get_tenant() @@ -26,7 +26,7 @@ class validate_token(unittest.TestCase): def tearDown(self): delete_token(self.token, self.auth_token) - + def test_validate_token_true(self): h = httplib2.Http(".cache") @@ -61,8 +61,8 @@ class validate_token(unittest.TestCase): self.tenant) resp, content = h.request(url, "GET", body='', headers={"Content-Type": "application/json", - "X-Auth-Token": self.exp_auth_token - }) + "X-Auth-Token": self.exp_auth_token} + ) if int(resp['status']) == 500: self.fail('IDM fault') elif int(resp['status']) == 503: @@ -119,4 +119,4 @@ def run(): unittest.main() if __name__ == '__main__': - unittest.main()
\ No newline at end of file + unittest.main() |