Merge "Update hacking version"

HACKING.rst

@@ -1,4 +1,4 @@
 openstack Style Commandments
-===============================================
+============================
 
 Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/

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.13,>=0.12.0 # Apache-2.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
 
 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 openstackdocstheme>=1.24.0 # Apache-2.0

tox.ini

@@ -49,8 +49,9 @@ commands = oslo_debug_helper {posargs}
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
+# E731 skipped as assign a lambda expression
 
 show-source = True
-ignore = E123,E125
+ignore = E123,E125,E731
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build

vitrage_tempest_plugin/tests/api/rca/base.py

@@ -140,10 +140,11 @@ class BaseRcaTest(BaseAlarmsTest):
         for item in links:
             source_alarm_name = alarms[item['source']].get(VProps.NAME)
             target_alarm_name = alarms[item['target']].get(VProps.NAME)
-            if item.get('key') != EdgeLabel.CAUSES \
-                    or item.get(EdgeProperties.RELATIONSHIP_TYPE) != EdgeLabel.CAUSES \
-                    or source_alarm_name != RCA_ALARM_NAME \
-                    or target_alarm_name != VITRAGE_ALARM_NAME:
+            relationship_type = item.get(EdgeProperties.RELATIONSHIP_TYPE)
+            if (item.get('key') != EdgeLabel.CAUSES or
+               relationship_type != EdgeLabel.CAUSES or
+               source_alarm_name != RCA_ALARM_NAME or
+               target_alarm_name != VITRAGE_ALARM_NAME):
                 flag = False
 
         self.assertThat(alarms, matchers.HasLength(3))

vitrage_tempest_plugin/tests/resources/mock_datasource/test_3rd_degree_scenarios.py

@@ -222,8 +222,8 @@ class TestLongProcessing(TestActionsBase):
                 try:
                     v_utils.generate_fake_host_alarm(
                         'nova.host-0-nova.zone-0-openstack.cluster-0',
-                        'test_high_availability_events'
-                        + str(self.num_of_sent_events))
+                        'test_high_availability_events' +
+                        str(self.num_of_sent_events))
                     self.num_of_sent_events += 1
                     time.sleep(spacing)
                 except Exception: