Merge "Move to hacking 0.10"

tempest/api/orchestration/stacks/test_resource_types.py

@@ -43,5 +43,7 @@ class ResourceTypesTest(base.BaseOrchestrationTest):
         """Verify it is possible to get template about resource types."""
         type_template = self.client.get_resource_type_template(
             'OS::Nova::Server')
-        self.assert_fields_in_dict(type_template, 'Outputs',
-            'Parameters', 'Resources')
+        self.assert_fields_in_dict(
+            type_template,
+            'Outputs',
+            'Parameters', 'Resources')

tempest/common/utils/linux/remote_client.py

@@ -23,7 +23,7 @@ from tempest import exceptions
 CONF = config.CONF
 
 
-class RemoteClient():
+class RemoteClient(object):
 
     # NOTE(afazekas): It should always get an address instead of server
     def __init__(self, server, username, password=None, pkey=None):
@@ -163,4 +163,4 @@ class RemoteClient():
                                                   % dhcp_client)
         if dhcp_client == 'udhcpc' and not fixed_ip:
             raise ValueError("need to set 'fixed_ip' for udhcpc client")
-        return getattr(self, '_renew_lease_' + dhcp_client)(fixed_ip=fixed_ip)
+        return getattr(self, '_renew_lease_' + dhcp_client)(fixed_ip=fixed_ip)

tempest/scenario/test_encrypted_cinder_volumes.py

@@ -62,4 +62,4 @@ class TestEncryptedCinderVolumes(manager.EncryptionScenarioTest):
         self.launch_instance()
         self.create_encrypted_volume('nova.volume.encryptors.'
                                      'cryptsetup.CryptsetupEncryptor')
-        self.attach_detach_volume()
+        self.attach_detach_volume()

tempest/scenario/test_security_groups_basic_ops.py

@@ -91,7 +91,7 @@ class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest):
             its own router connected to the public network
     """
 
-    class TenantProperties():
+    class TenantProperties(object):
         """
         helper class to save tenant details
             id

tempest/tests/common/test_custom_matchers.py

@@ -63,4 +63,4 @@ class TestMatchesDictExceptForKeys(base.TestCase,
          "  b: expected 2, actual None\n",
          {'a': 1, 'b': None, 'foo': 1},
          matches_matcher)
-    ]
+    ]

test-requirements.txt

@@ -1,7 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking>=0.9.2,<0.10
+hacking<0.11,>=0.10.0
 # needed for doc build
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 python-subunit>=0.0.18

tox.ini

@@ -125,11 +125,9 @@ import_exceptions = tempest.services
 
 [flake8]
 # E125 is a won't fix until https://github.com/jcrocholl/pep8/issues/126 is resolved.  For further detail see https://review.openstack.org/#/c/36788/
-# H402 skipped because some docstrings aren't sentences
 # E123 skipped because it is ignored by default in the default pep8
 # E129 skipped because it is too limiting when combined with other rules
-# H305 skipped because it is inconsistent between python versions
-# Skipped because of new hacking 0.9: H405,H904
-ignore = E125,H402,E123,E129,H404,H405,H904,H305
+# Skipped because of new hacking 0.9: H405
+ignore = E125,E123,E129,H404,H405,H105
 show-source = True
 exclude = .git,.venv,.tox,dist,doc,openstack,*egg