From 85e41367d808fcc13736581d0b54b427c62ff002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Thu, 26 Oct 2023 11:29:14 +0200 Subject: [PATCH] Replace deprecated black-regex with exclude-regex Change-Id: Ifda518724d01c0b41810ef9b1a9ab932fd5670a9 --- openstack/keystone/keystone.spec.j2 | 4 ++-- openstack/murano-pkg-check/murano-pkg-check.spec.j2 | 2 +- openstack/neutron/neutron.spec.j2 | 2 +- openstack/os-service-types/os-service-types.spec.j2 | 2 +- openstack/oslo.messaging/oslo.messaging.spec.j2 | 2 +- openstack/osprofiler/osprofiler.spec.j2 | 2 +- openstack/python-barbicanclient/python-barbicanclient.spec.j2 | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openstack/keystone/keystone.spec.j2 b/openstack/keystone/keystone.spec.j2 index 4aabfb7bd..0c2077de4 100644 --- a/openstack/keystone/keystone.spec.j2 +++ b/openstack/keystone/keystone.spec.j2 @@ -212,10 +212,10 @@ exit 0 # don't want to depend on hacking for package building rm keystone/tests/unit/test_hacking_checks.py %if 0%{?suse_version} -PYTHON=python3 stestr run --black-regex keystone.tests.unit.test_policy.GeneratePolicyFileTestCase.test_policy_generator_from_command_line +PYTHON=python3 stestr run --exclude-regex keystone.tests.unit.test_policy.GeneratePolicyFileTestCase.test_policy_generator_from_command_line %endif %if 0%{?rdo} -stestr-3 run --black-regex keystone.tests.unit.test_policy.GeneratePolicyFileTestCase.test_policy_generator_from_command_line +stestr-3 run --exclude-regex keystone.tests.unit.test_policy.GeneratePolicyFileTestCase.test_policy_generator_from_command_line %endif %post diff --git a/openstack/murano-pkg-check/murano-pkg-check.spec.j2 b/openstack/murano-pkg-check/murano-pkg-check.spec.j2 index 118dc507b..28e8ab129 100644 --- a/openstack/murano-pkg-check/murano-pkg-check.spec.j2 +++ b/openstack/murano-pkg-check/murano-pkg-check.spec.j2 @@ -55,7 +55,7 @@ Murano package validator tool %check %{__python3} -m stestr.cli --test-path=./muranopkgcheck/tests/ \ run \ - --black-regex=muranopkgcheck.tests.test_manager.ManagerTest.test_validate + --exclude-regex=muranopkgcheck.tests.test_manager.ManagerTest.test_validate %files -n {{ py2name(py_versions='py3') }} %doc README.rst diff --git a/openstack/neutron/neutron.spec.j2 b/openstack/neutron/neutron.spec.j2 index 8a924e876..e992dd173 100644 --- a/openstack/neutron/neutron.spec.j2 +++ b/openstack/neutron/neutron.spec.j2 @@ -414,7 +414,7 @@ exit 0 %check # don't want to depend on hacking for package building rm neutron/tests/unit/hacking/test_checks.py -python3 -m stestr.cli --test-path neutron/tests/unit run --concurrency 2 --black-regex '(neutron.tests.unit.objects|neutron.tests.unit.plugins)' +python3 -m stestr.cli --test-path neutron/tests/unit run --concurrency 2 --exclude-regex '(neutron.tests.unit.objects|neutron.tests.unit.plugins)' %post %tmpfiles_create %{_tmpfilesdir}/%{name}.conf diff --git a/openstack/os-service-types/os-service-types.spec.j2 b/openstack/os-service-types/os-service-types.spec.j2 index a09ee1b65..48fc43741 100644 --- a/openstack/os-service-types/os-service-types.spec.j2 +++ b/openstack/os-service-types/os-service-types.spec.j2 @@ -60,7 +60,7 @@ This package contains the documentation. %py_req_cleanup # The TestRemote test cases must be excluded because they introduce a circular # dependency on python-keystoneauth1. -# Using --black-regex with stestr is not enough because the problem occurs when +# Using --exclude-regex with stestr is not enough because the problem occurs when # keystoneauth is imported, not when the test is run. rm os_service_types/tests/test_remote.py diff --git a/openstack/oslo.messaging/oslo.messaging.spec.j2 b/openstack/oslo.messaging/oslo.messaging.spec.j2 index 552ae1444..bafc6d8f0 100644 --- a/openstack/oslo.messaging/oslo.messaging.spec.j2 +++ b/openstack/oslo.messaging/oslo.messaging.spec.j2 @@ -105,7 +105,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} # fail without it rm -rf oslo_messaging/tests/functional # 3 cyrus tests fail on rdo with time out -%{openstack_stestr_run} --black-regex '^oslo_messaging.tests.(functional|drivers.test_amqp_driver.TestCyrusAuthentication.test_authentication_(ok|ignore_default_realm|default_realm))' +%{openstack_stestr_run} --exclude-regex '^oslo_messaging.tests.(functional|drivers.test_amqp_driver.TestCyrusAuthentication.test_authentication_(ok|ignore_default_realm|default_realm))' %files -n {{ py2name(py_versions='py3') }} %license LICENSE diff --git a/openstack/osprofiler/osprofiler.spec.j2 b/openstack/osprofiler/osprofiler.spec.j2 index 94206a782..7d3b7160e 100644 --- a/openstack/osprofiler/osprofiler.spec.j2 +++ b/openstack/osprofiler/osprofiler.spec.j2 @@ -87,7 +87,7 @@ PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html rm -rf doc/build/html/.{doctrees,buildinfo} %check -%{openstack_stestr_run} --black-regex '(^osprofiler.tests.unit.drivers.test_jaeger.JaegerTestCase.*$)' +%{openstack_stestr_run} --exclude-regex '(^osprofiler.tests.unit.drivers.test_jaeger.JaegerTestCase.*$)' %files -n {{ py2name(py_versions='py3') }} %license LICENSE diff --git a/openstack/python-barbicanclient/python-barbicanclient.spec.j2 b/openstack/python-barbicanclient/python-barbicanclient.spec.j2 index 035500fbc..7785d39ff 100644 --- a/openstack/python-barbicanclient/python-barbicanclient.spec.j2 +++ b/openstack/python-barbicanclient/python-barbicanclient.spec.j2 @@ -86,7 +86,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %check %{openstack_stestr_run} \ - --black-regex 'barbicanclient.tests.test_barbican.WhenTestingBarbicanCLI.test_should_show_usage_with_help_flag' + --exclude-regex 'barbicanclient.tests.test_barbican.WhenTestingBarbicanCLI.test_should_show_usage_with_help_flag' %files -n python3-barbicanclient %license LICENSE