From 1c305f595ff5216723d3f21597d664c8e558710e Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 5 Feb 2019 17:38:40 +0000 Subject: [PATCH] Update hacking version Change-Id: I78d0722f3864c8225a64c4da2456ba2560af5081 --- blazar_tempest_plugin/tests/scenario/manager_freeze.py | 5 +++-- .../tests/scenario/resource_reservation_scenario.py | 4 ++-- test-requirements.txt | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/blazar_tempest_plugin/tests/scenario/manager_freeze.py b/blazar_tempest_plugin/tests/scenario/manager_freeze.py index 0d26a22..072ca6f 100644 --- a/blazar_tempest_plugin/tests/scenario/manager_freeze.py +++ b/blazar_tempest_plugin/tests/scenario/manager_freeze.py @@ -676,8 +676,9 @@ class ScenarioTest(tempest.test.BaseTestCase): addresses = (server['addresses'][network['name']] if network else []) for address in addresses: - if (address['version'] == CONF.validation.ip_version_for_ssh - and address['OS-EXT-IPS:type'] == 'fixed'): + if ((address['version'] == + CONF.validation.ip_version_for_ssh) and + address['OS-EXT-IPS:type'] == 'fixed'): return address['addr'] raise exceptions.ServerUnreachable(server_id=server['id']) else: diff --git a/blazar_tempest_plugin/tests/scenario/resource_reservation_scenario.py b/blazar_tempest_plugin/tests/scenario/resource_reservation_scenario.py index 075133c..a6e28b3 100644 --- a/blazar_tempest_plugin/tests/scenario/resource_reservation_scenario.py +++ b/blazar_tempest_plugin/tests/scenario/resource_reservation_scenario.py @@ -78,8 +78,8 @@ class ResourceReservationScenarioTest(manager.ScenarioTest): if lease: events = lease['events'] return len([evt for evt in events - if evt['event_type'] == 'end_lease' - and evt['status'] == 'DONE']) > 0 + if evt['event_type'] == 'end_lease' and + evt['status'] == 'DONE']) > 0 else: LOG.info("Lease with id %s is empty", lease_id) except Exception as e: diff --git a/test-requirements.txt b/test-requirements.txt index 1fda7fb..f4b6f8e 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.13,>=0.12.0 # Apache-2.0 +hacking>=1.1.0,<1.2.0 # Apache-2.0 # docs sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD