Merge "Test software RAID in deploy-time on Victoria and newer"
diff --git a/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py b/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py
index e132d10..bad3767 100644
--- a/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py
+++ b/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py
@@ -216,8 +216,9 @@
return False
return True
- if (not test_utils.call_until_true(_try_to_associate_instance,
- duration=CONF.baremetal.association_timeout, sleep_for=1)):
+ if (not test_utils.call_until_true(
+ _try_to_associate_instance,
+ duration=CONF.baremetal.association_timeout, sleep_for=1)):
msg = ('Timed out waiting to associate instance to ironic node '
'uuid %s' % instance_uuid)
raise lib_exc.TimeoutException(msg)
diff --git a/tox.ini b/tox.ini
index 28ac9e7..ac55994 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-minversion = 3.1.0
+minversion = 3.2.1
envlist = pep8
skipsdist = True
ignore_basepython_conflict=true
@@ -45,9 +45,8 @@
commands = oslo_debug_helper {posargs}
[flake8]
-# [E129] Visually indented line with same indent as next logical line.
# [W503] Line break occurred before a binary operator. Conflicts with W504.
-ignore = E129,W503
+ignore = W503
show-source = True
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build