diff --git a/.zuul.yaml b/.zuul.yaml index fd2c00f..af07a0a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -24,7 +24,7 @@ vars: rtd_webhook_id: '44747' templates: - - openstack-python3-zed-jobs + - openstack-python3-jobs - docs-on-readthedocs - check-requirements check: diff --git a/ironic_staging_drivers/tests/unit/libvirt/test_power.py b/ironic_staging_drivers/tests/unit/libvirt/test_power.py index 591f060..250b19f 100644 --- a/ironic_staging_drivers/tests/unit/libvirt/test_power.py +++ b/ironic_staging_drivers/tests/unit/libvirt/test_power.py @@ -167,22 +167,22 @@ class LibvirtValidateParametersTestCase(BaseLibvirtTest): class LibvirtPrivateMethodsTestCase(BaseLibvirtTest): - @mock.patch.object(power.libvirt, 'openAuth', autospec=True) - def test__get_libvirt_connection_sasl_auth(self, libvirt_open_mock): + @mock.patch.object(power.libvirt, 'openAuth') + def test__get_libvirt_connection_sasl_auth(self, libvirt_openauth_mock): node = obj_utils.get_test_node( self.context, driver='staging-libvirt', driver_info=_get_test_libvirt_driver_info('sasl')) power._get_libvirt_connection(node['driver_info']) - libvirt_open_mock.assert_called_once_with( + libvirt_openauth_mock.assert_called_once_with( 'test+tcp://localhost:5000/test', [[power.libvirt.VIR_CRED_AUTHNAME, power.libvirt.VIR_CRED_PASSPHRASE], mock.ANY, # Inline cred function None], 0) - @mock.patch.object(power.libvirt, 'open', autospec=True) + @mock.patch.object(power.libvirt, 'open') def test__get_libvirt_connection_ssh(self, libvirt_open_mock): node = obj_utils.get_test_node( self.context, @@ -193,7 +193,7 @@ class LibvirtPrivateMethodsTestCase(BaseLibvirtTest): libvirt_open_mock.assert_called_once_with( 'qemu+ssh://test@test/?keyfile=/test/key/file&no_verify=1') - @mock.patch.object(power.libvirt, 'open', autospec=True) + @mock.patch.object(power.libvirt, 'open') def test__get_libvirt_connection_socket(self, libvirt_open_mock): node = obj_utils.get_test_node( self.context, diff --git a/test-requirements.txt b/test-requirements.txt index fc4349b..15db7b5 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,3 +7,4 @@ coverage!=4.4,>=4.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 testtools>=2.2.0 # MIT stestr>=2.0.0 # Apache-2.0 + diff --git a/tox.ini b/tox.ini index 3804b81..4798ca0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,5 @@ [tox] minversion = 3.18.0 -skipsdist = True envlist = py3,pep8 ignore_basepython_conflict=true @@ -18,7 +17,12 @@ deps = -r{toxinidir}/extra-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:pep8] deps =