diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-06-14 18:37:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-06-14 18:37:12 +0000 |
| commit | 0da5bfe42875457a26a0c5040fcc3b0e1ffb5d2a (patch) | |
| tree | 7fc0ae93d2469702e61bc95d64e0d17b66334683 | |
| parent | 99e7660d56431d5480999c2674b1aa12254732b2 (diff) | |
| parent | 0059f045a9958b1748fcec51799d8cffc0831440 (diff) | |
| download | python-openstackclient-0da5bfe42875457a26a0c5040fcc3b0e1ffb5d2a.tar.gz | |
Merge "Ignore most of the new hacking 0.9.2 rules"
| -rw-r--r-- | openstackclient/compute/v2/usage.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/common/test_utils.py | 5 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/openstackclient/compute/v2/usage.py b/openstackclient/compute/v2/usage.py index f7e11bca..ed98af26 100644 --- a/openstackclient/compute/v2/usage.py +++ b/openstackclient/compute/v2/usage.py @@ -36,7 +36,7 @@ class ListUsage(lister.Lister): metavar="<start>", default=None, help="Usage range start date, ex 2012-01-20" - " (default: 4 weeks ago)." + " (default: 4 weeks ago)." ) parser.add_argument( "--end", diff --git a/openstackclient/tests/common/test_utils.py b/openstackclient/tests/common/test_utils.py index 3650746b..fbc1a926 100644 --- a/openstackclient/tests/common/test_utils.py +++ b/openstackclient/tests/common/test_utils.py @@ -107,8 +107,9 @@ class TestFindResource(test_utils.TestCase): def test_find_resource_find_not_found(self): self.manager.get = mock.Mock(side_effect=Exception('Boom!')) - self.manager.find = mock.Mock(side_effect= - exceptions.NotFound(404, "2")) + self.manager.find = mock.Mock( + side_effect=exceptions.NotFound(404, "2") + ) result = self.assertRaises(exceptions.CommandError, utils.find_resource, self.manager, @@ -24,6 +24,6 @@ commands = python setup.py test --coverage --testr-args='{posargs}' downloadcache = ~/cache/pip [flake8] -ignore = E126,E202,W602,H302,H402 +ignore = E126,E202,W602,H302,H402,E265,H305,H307,H405,H904 show-source = True exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools |