diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-29 18:01:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-29 18:01:16 +0000 |
| commit | 476a959d37e5ef1a5b4b1ee3ecc7ece22e4e2811 (patch) | |
| tree | d060590ca9b1902ad86e6e03f395e3706f903ad7 | |
| parent | a104e1c5c64f7351d42fc2fd21efffd9e3d4c821 (diff) | |
| parent | 394d202a6aca41a5f90436d9c6a5728bf8ce5af8 (diff) | |
| download | python-keystoneclient-476a959d37e5ef1a5b4b1ee3ecc7ece22e4e2811.tar.gz | |
Merge "Update hacking to 0.9.x"
| -rw-r--r-- | keystoneclient/httpclient.py | 2 | ||||
| -rw-r--r-- | keystoneclient/tests/test_auth_token_middleware.py | 2 | ||||
| -rw-r--r-- | keystoneclient/tests/v2_0/test_shell.py | 7 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 3 |
5 files changed, 8 insertions, 8 deletions
diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py index 7c1af06..ce49dc4 100644 --- a/keystoneclient/httpclient.py +++ b/keystoneclient/httpclient.py @@ -20,8 +20,8 @@ OpenStack Client interface. Handles the REST calls and responses. """ import logging -import pkg_resources +import pkg_resources import requests from six.moves.urllib import parse as urlparse diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py index 4ff807b..3c42db3 100644 --- a/keystoneclient/tests/test_auth_token_middleware.py +++ b/keystoneclient/tests/test_auth_token_middleware.py @@ -695,7 +695,7 @@ class CommonAuthTokenMiddlewareTest(object): self.middleware(req.environ, self.start_fake_response) self.assertEqual(200, self.response_status) - # This time use the PKI(Z) token + # This time use the PKI(Z) token req.headers['X-Auth-Token'] = token self.middleware(req.environ, self.start_fake_response) diff --git a/keystoneclient/tests/v2_0/test_shell.py b/keystoneclient/tests/v2_0/test_shell.py index 5f80fc1..0fafb71 100644 --- a/keystoneclient/tests/v2_0/test_shell.py +++ b/keystoneclient/tests/v2_0/test_shell.py @@ -145,10 +145,9 @@ class ShellTests(utils.TestCase): self.run_command('user-update --name new-user1' ' --email user@email.com --enabled true 1') self.assert_called('PUT', '/users/1') - self.assertRequestBodyIs(json={'user': {'id': '1', - 'email': 'user@email.com', - 'enabled': True, - 'name': 'new-user1'}}) + body = {'user': {'id': '1', 'email': 'user@email.com', + 'enabled': True, 'name': 'new-user1'}} + self.assertRequestBodyIs(json=body) required = 'User not updated, no arguments present.' out = self.run_command('user-update 1') diff --git a/test-requirements.txt b/test-requirements.txt index c58b105..e0387f0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.8.0,<0.9 +hacking>=0.9.2,<0.10 coverage>=3.6 discover @@ -38,7 +38,8 @@ commands = # H803 Commit message should not end with a period (do not remove per list discussion) # H405: multi line docstring summary not separated with an empty line # E122: continuation line missing indentation or outdented -ignore = F821,H304,H803,H405,E122 +# H904: Wrap long lines in parentheses instead of a backslash +ignore = F821,H304,H803,H405,E122,H904 show-source = True exclude = .venv,.tox,dist,doc,*egg,build,*openstack/common* |