Skip to content

Synchronise yoga with upstream #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ironic_python_agent/hardware.py
Original file line number Diff line number Diff line change
Expand Up @@ -1807,10 +1807,11 @@ def _smartctl_security_check(self, block_device):
'ATA commands via the `smartctl` utility with device '
'%s do not succeed.', block_device.name)
return False
except OSError:
except OSError as e:
# Processutils can raise OSError if a path is not found,
# and it is okay that we tollerate that since it was the
# prior behavior.
LOG.warning('Unable to execute `smartctl` utility: %s', e)
return True

def _ata_erase(self, block_device):
Expand Down
15 changes: 8 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[tox]
minversion = 3.18.0
skipsdist = True
envlist = py3,functional,pep8
ignore_basepython_conflict=true

[testenv]
usedevelop = True
basepython = python3
setenv =
VIRTUAL_ENV={envdir}
Expand All @@ -19,7 +17,13 @@ deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run {posargs}
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
passenv =
http_proxy
HTTP_PROXY
https_proxy
HTTPS_PROXY
no_proxy
NO_PROXY

[testenv:functional]
# Define virtualenv directory, port to use for functional testing, and number
Expand All @@ -33,8 +37,7 @@ setenv =
commands = stestr run {posargs}

[testenv:pep8]
usedevelop = False
deps=
deps =
hacking>=4.1.0,<5.0.0 # Apache-2.0
bashate>=0.5.1 # Apache-2.0
flake8-import-order>=0.17.1 # LGPLv3
Expand Down Expand Up @@ -87,7 +90,6 @@ commands =
make -C doc/build/pdf

[testenv:releasenotes]
usedevelop = False
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-r{toxinidir}/doc/requirements.txt
Expand Down Expand Up @@ -126,7 +128,6 @@ commands =
oslo-config-generator --config-file=tools/config/ipa-config-generator.conf

[testenv:bandit]
usedevelop = False
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
-r{toxinidir}/test-requirements.txt
Expand Down