openstack/rpm-packaging
Code Issues Proposed changes

Replace deprecated black-regex with exclude-regex

Browse Source 
Change-Id: Ifda518724d01c0b41810ef9b1a9ab932fd5670a9
This commit is contained in:
Dirk Müller
2023-10-26 11:29:14 +02:00
parent 9fda13c09e
commit 85e41367d8
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/keystone/keystone.spec.j2
View File

@@ -212,10 +212,10 @@ exit 0
# don't want to depend on hacking for package building # don't want to depend on hacking for package building
rm keystone/tests/unit/test_hacking_checks.py rm keystone/tests/unit/test_hacking_checks.py
%if 0%{?suse_version} %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 %endif
%if 0%{?rdo} %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 %endif
%post %post

2
openstack/murano-pkg-check/murano-pkg-check.spec.j2
View File

@@ -55,7 +55,7 @@ Murano package validator tool
%check %check
%{__python3} -m stestr.cli --test-path=./muranopkgcheck/tests/ \ %{__python3} -m stestr.cli --test-path=./muranopkgcheck/tests/ \
run \ 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') }} %files -n {{ py2name(py_versions='py3') }}
%doc README.rst %doc README.rst

2
openstack/neutron/neutron.spec.j2
View File

@@ -414,7 +414,7 @@ exit 0
%check %check
# don't want to depend on hacking for package building # don't want to depend on hacking for package building
rm neutron/tests/unit/hacking/test_checks.py 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 %post
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf %tmpfiles_create %{_tmpfilesdir}/%{name}.conf

2
openstack/os-service-types/os-service-types.spec.j2
View File

@@ -60,7 +60,7 @@ This package contains the documentation.
%py_req_cleanup %py_req_cleanup
# The TestRemote test cases must be excluded because they introduce a circular # The TestRemote test cases must be excluded because they introduce a circular
# dependency on python-keystoneauth1. # 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. # keystoneauth is imported, not when the test is run.
rm os_service_types/tests/test_remote.py rm os_service_types/tests/test_remote.py

2
openstack/oslo.messaging/oslo.messaging.spec.j2
View File

@@ -105,7 +105,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
# fail without it # fail without it
rm -rf oslo_messaging/tests/functional rm -rf oslo_messaging/tests/functional
# 3 cyrus tests fail on rdo with time out # 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') }} %files -n {{ py2name(py_versions='py3') }}
%license LICENSE %license LICENSE

2
openstack/osprofiler/osprofiler.spec.j2
View File

@@ -87,7 +87,7 @@ PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html
rm -rf doc/build/html/.{doctrees,buildinfo} rm -rf doc/build/html/.{doctrees,buildinfo}
%check %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') }} %files -n {{ py2name(py_versions='py3') }}
%license LICENSE %license LICENSE

2
openstack/python-barbicanclient/python-barbicanclient.spec.j2
View File

@@ -86,7 +86,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
%check %check
%{openstack_stestr_run} \ %{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 %files -n python3-barbicanclient
%license LICENSE %license LICENSE