From e741bb121e6bb3af3dfe747501e0641a5f2242e5 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 4 Sep 2018 10:13:09 +0200 Subject: [PATCH] Remove os-testr from requirements The community moves towards standardizing around stestr, so lets drop all the other variants. Change-Id: I85924171b1c75f082d2e85ff46e56162587c6c41 --- openstack/cinder/cinder.spec.j2 | 3 +-- openstack/glance_store/glance_store.spec.j2 | 1 - openstack/karbor/karbor.spec.j2 | 1 - openstack/keystoneauth1/keystoneauth1.spec.j2 | 1 - .../kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 | 1 - openstack/monasca-agent/monasca-agent.spec.j2 | 1 - openstack/monasca-api/monasca-api.spec.j2 | 4 ++-- openstack/monasca-log-api/monasca-log-api.spec.j2 | 4 ++-- .../monasca-notification/monasca-notification.spec.j2 | 2 +- openstack/monasca-transform/monasca-transform.spec.j2 | 4 ++-- openstack/neutron/neutron.spec.j2 | 1 - openstack/nova/nova.spec.j2 | 1 - openstack/os-xenapi/os-xenapi.spec.j2 | 1 - openstack/osc-lib/osc-lib.spec.j2 | 1 - openstack/ovsdbapp/ovsdbapp.spec.j2 | 1 - openstack/python-cinderclient/python-cinderclient.spec.j2 | 7 ++----- openstack/python-ironicclient/python-ironicclient.spec.j2 | 2 +- openstack/python-karborclient/python-karborclient.spec.j2 | 1 - .../python-openstackclient/python-openstackclient.spec.j2 | 1 - openstack/python-saharaclient/python-saharaclient.spec.j2 | 4 ++-- openstack/python-senlinclient/python-senlinclient.spec.j2 | 1 - openstack/vmware-nsx/vmware-nsx.spec.j2 | 1 - 22 files changed, 13 insertions(+), 31 deletions(-) diff --git a/openstack/cinder/cinder.spec.j2 b/openstack/cinder/cinder.spec.j2 index 45b817953..31614b579 100644 --- a/openstack/cinder/cinder.spec.j2 +++ b/openstack/cinder/cinder.spec.j2 @@ -39,7 +39,6 @@ BuildRequires: {{ py2pkg('lxml') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('python-novaclient') }} BuildRequires: {{ py2pkg('os-brick') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('os-win') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.db') }} @@ -293,7 +292,7 @@ rm -rf %{buildroot}%{_prefix}/%{_sysconfdir} exit 0 %check -# OS_TEST_PATH=./cinder/tests/unit PYTHONPATH=. ostestr +stestr run %post api diff --git a/openstack/glance_store/glance_store.spec.j2 b/openstack/glance_store/glance_store.spec.j2 index 77f9468c5..5cf292e6b 100644 --- a/openstack/glance_store/glance_store.spec.j2 +++ b/openstack/glance_store/glance_store.spec.j2 @@ -20,7 +20,6 @@ BuildRequires: {{ py2pkg('jsonschema', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('python-keystoneclient', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('os-brick', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('os-testr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.concurrency', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.config', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.i18n', py_versions=['py2', 'py3']) }} diff --git a/openstack/karbor/karbor.spec.j2 b/openstack/karbor/karbor.spec.j2 index f4f5fad68..fb8564f24 100644 --- a/openstack/karbor/karbor.spec.j2 +++ b/openstack/karbor/karbor.spec.j2 @@ -46,7 +46,6 @@ BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('python-neutronclient') }} BuildRequires: {{ py2pkg('python-novaclient') }} BuildRequires: {{ py2pkg('os-api-ref') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('oslo.concurrency') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.context') }} diff --git a/openstack/keystoneauth1/keystoneauth1.spec.j2 b/openstack/keystoneauth1/keystoneauth1.spec.j2 index e122ffdfc..815c48a49 100644 --- a/openstack/keystoneauth1/keystoneauth1.spec.j2 +++ b/openstack/keystoneauth1/keystoneauth1.spec.j2 @@ -16,7 +16,6 @@ BuildRequires: {{ py2pkg('lxml', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oauthlib', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('os-service-types', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('os-testr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.config', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.utils', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }} diff --git a/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 b/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 index 07b11d2ec..14d51fef0 100644 --- a/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 +++ b/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 @@ -23,7 +23,6 @@ BuildRequires: {{ py2pkg('reno') }} BuildRequires: {{ py2pkg('setuptools') }} Requires: {{ py2pkg('Tempest') }} Requires: {{ py2pkg('kubernetes') }} -Requires: {{ py2pkg('os-testr') }} Requires: {{ py2pkg('oslotest') }} Requires: {{ py2pkg('pbr') }} Requires: {{ py2pkg('six') }} diff --git a/openstack/monasca-agent/monasca-agent.spec.j2 b/openstack/monasca-agent/monasca-agent.spec.j2 index 1ba6fcf3e..4e00fc5d2 100644 --- a/openstack/monasca-agent/monasca-agent.spec.j2 +++ b/openstack/monasca-agent/monasca-agent.spec.j2 @@ -48,7 +48,6 @@ BuildRequires: {{ py2pkg('monasca-common') }} BuildRequires: {{ py2pkg('python-monascaclient') }} BuildRequires: {{ py2pkg('netaddr') }} BuildRequires: {{ py2pkg('ntplib') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('oslo.concurrency') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.i18n') }} diff --git a/openstack/monasca-api/monasca-api.spec.j2 b/openstack/monasca-api/monasca-api.spec.j2 index d883fdaa8..4ebee87b8 100644 --- a/openstack/monasca-api/monasca-api.spec.j2 +++ b/openstack/monasca-api/monasca-api.spec.j2 @@ -33,7 +33,6 @@ BuildRequires: {{ py2pkg('keystonemiddleware') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('monasca-common') }} BuildRequires: {{ py2pkg('nose') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.context') }} BuildRequires: {{ py2pkg('oslo.db') }} @@ -48,6 +47,7 @@ BuildRequires: {{ py2pkg('pyparsing') }} BuildRequires: {{ py2pkg('python-subunit') }} BuildRequires: {{ py2pkg('simplejson') }} BuildRequires: {{ py2pkg('six') }} +BuildRequires: {{ py2pkg('stestr') }} BuildRequires: {{ py2pkg('testrepository') }} BuildRequires: {{ py2pkg('testscenarios') }} BuildRequires: {{ py2pkg('testtools') }} @@ -141,7 +141,7 @@ install -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/monasca-api-wsgi.py %check find . -type f -name *.pyc -delete -OS_TEST_PATH=./monasca_api/tests PYTHONPATH=. ostestr +OS_TEST_PATH=./monasca_api/tests PYTHONPATH=. python2 -m stestr.cli run %pre %openstack_pre_user_group_create monasca-api monasca /sbin/nologin diff --git a/openstack/monasca-log-api/monasca-log-api.spec.j2 b/openstack/monasca-log-api/monasca-log-api.spec.j2 index b645ebb2f..464af0957 100644 --- a/openstack/monasca-log-api/monasca-log-api.spec.j2 +++ b/openstack/monasca-log-api/monasca-log-api.spec.j2 @@ -21,7 +21,6 @@ BuildRequires: {{ py2pkg('keystonemiddleware') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('monasca-common') }} BuildRequires: {{ py2pkg('monasca-statsd') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.context') }} BuildRequires: {{ py2pkg('oslo.log') }} @@ -31,6 +30,7 @@ BuildRequires: {{ py2pkg('oslo.utils') }} BuildRequires: {{ py2pkg('oslotest') }} BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('simplejson') }} +BuildRequires: {{ py2pkg('stestr') }} Requires: python-%{sname} = %{version} BuildArch: noarch %if 0%{?suse_version} @@ -111,7 +111,7 @@ rm -f %{buildroot}%{python2_sitelib}/monasca_log_api/.gitignore %check find . -type f -name *.pyc -delete -OS_TEST_PATH=./monasca_log_api/tests PYTHONPATH=. ostestr +OS_TEST_PATH=./monasca_log_api/tests PYTHONPATH=. python2 -m stestr.cli run %pre %openstack_pre_user_group_create monasca-log-api monasca diff --git a/openstack/monasca-notification/monasca-notification.spec.j2 b/openstack/monasca-notification/monasca-notification.spec.j2 index 6743f6bf4..3e4d2e668 100644 --- a/openstack/monasca-notification/monasca-notification.spec.j2 +++ b/openstack/monasca-notification/monasca-notification.spec.j2 @@ -26,13 +26,13 @@ BuildRequires: {{ py2pkg('keystoneauth1') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('monasca-common') }} BuildRequires: {{ py2pkg('monasca-statsd') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.log') }} BuildRequires: {{ py2pkg('oslotest') }} BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('requests') }} BuildRequires: {{ py2pkg('six') }} +BuildRequires: {{ py2pkg('stestr') }} Requires: logrotate Requires: python-%{sname} = %{version}-%{release} BuildArch: noarch diff --git a/openstack/monasca-transform/monasca-transform.spec.j2 b/openstack/monasca-transform/monasca-transform.spec.j2 index a8c27f173..dead79e99 100644 --- a/openstack/monasca-transform/monasca-transform.spec.j2 +++ b/openstack/monasca-transform/monasca-transform.spec.j2 @@ -26,7 +26,6 @@ BuildRequires: {{ py2pkg('kazoo') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('monasca-common') }} BuildRequires: {{ py2pkg('nose') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.log') }} BuildRequires: {{ py2pkg('oslo.service') }} @@ -35,6 +34,7 @@ BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('psutil') }} BuildRequires: {{ py2pkg('setuptools') }} BuildRequires: {{ py2pkg('six') }} +BuildRequires: {{ py2pkg('stestr') }} BuildRequires: {{ py2pkg('stevedore') }} BuildRequires: {{ py2pkg('tooz') }} BuildRequires: zip @@ -137,7 +137,7 @@ crudini --set %{mon_trans_conf} service spark_python_files %{_datadir}/%{sname}/ %check # automated tests need to be restricted, as functional tests require running Spark find . -type f -name *.pyc -delete -ostestr +python2 -m stestr.cli run %pre # create user and groups diff --git a/openstack/neutron/neutron.spec.j2 b/openstack/neutron/neutron.spec.j2 index 80f2ecde4..b0836c165 100644 --- a/openstack/neutron/neutron.spec.j2 +++ b/openstack/neutron/neutron.spec.j2 @@ -36,7 +36,6 @@ BuildRequires: {{ py2pkg('ddt') }} BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('mock') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('oslotest') }} BuildRequires: {{ py2pkg('python-subunit') }} BuildRequires: {{ py2pkg('reno') }} diff --git a/openstack/nova/nova.spec.j2 b/openstack/nova/nova.spec.j2 index 69154a808..3e3119c53 100644 --- a/openstack/nova/nova.spec.j2 +++ b/openstack/nova/nova.spec.j2 @@ -56,7 +56,6 @@ BuildRequires: {{ py2pkg('os-api-ref') }} BuildRequires: {{ py2pkg('os-brick') }} BuildRequires: {{ py2pkg('os-resource-classes') }} BuildRequires: {{ py2pkg('os-service-types') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('os-vif') }} BuildRequires: {{ py2pkg('os-win') }} BuildRequires: {{ py2pkg('oslo.cache') }} diff --git a/openstack/os-xenapi/os-xenapi.spec.j2 b/openstack/os-xenapi/os-xenapi.spec.j2 index ac0432fc9..0735b9512 100644 --- a/openstack/os-xenapi/os-xenapi.spec.j2 +++ b/openstack/os-xenapi/os-xenapi.spec.j2 @@ -13,7 +13,6 @@ Source0: https://files.pythonhosted.org/packages/source/o/{{ pypi_name }} BuildRequires: openstack-macros BuildRequires: python-devel BuildRequires: {{ py2pkg('eventlet') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('oslo.concurrency') }} BuildRequires: {{ py2pkg('oslo.i18n') }} BuildRequires: {{ py2pkg('oslo.log') }} diff --git a/openstack/osc-lib/osc-lib.spec.j2 b/openstack/osc-lib/osc-lib.spec.j2 index 6fbd2ff40..36f446972 100644 --- a/openstack/osc-lib/osc-lib.spec.j2 +++ b/openstack/osc-lib/osc-lib.spec.j2 @@ -19,7 +19,6 @@ BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('keystoneauth1', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('openstacksdk', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('os-testr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.i18n', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.utils', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }} diff --git a/openstack/ovsdbapp/ovsdbapp.spec.j2 b/openstack/ovsdbapp/ovsdbapp.spec.j2 index feadbc44a..36fe8dd99 100644 --- a/openstack/ovsdbapp/ovsdbapp.spec.j2 +++ b/openstack/ovsdbapp/ovsdbapp.spec.j2 @@ -13,7 +13,6 @@ Source0: https://files.pythonhosted.org/packages/source/o/{{ pypi_name }} BuildRequires: openstack-macros BuildRequires: python-devel BuildRequires: {{ py2pkg('fixtures') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('oslotest') }} BuildRequires: {{ py2pkg('ovs') }} BuildRequires: {{ py2pkg('pbr') }} diff --git a/openstack/python-cinderclient/python-cinderclient.spec.j2 b/openstack/python-cinderclient/python-cinderclient.spec.j2 index 44899c80e..c034d77e3 100644 --- a/openstack/python-cinderclient/python-cinderclient.spec.j2 +++ b/openstack/python-cinderclient/python-cinderclient.spec.j2 @@ -18,14 +18,13 @@ BuildRequires: {{ py2pkg('ddt', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('keystoneauth1', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('os-testr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.serialization', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.utils', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('python-subunit', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('requests', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('requests-mock', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('testrepository', py_versions=['py2', 'py3']) }} +BuildRequires: {{ py2pkg('stestr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('testscenarios', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('testtools', py_versions=['py2', 'py3']) }} Requires: {{ py2pkg('Babel') }} @@ -96,9 +95,7 @@ install -p -D -m 644 tools/cinder.bash_completion %{buildroot}%{_sysconfdir}/bas %check rm cinderclient/tests/unit/test_shell.py -%{python_expand rm -rf .testrepository -ostestr -} +%python_exec -m stestr.cli run %files %{python_files} %license LICENSE diff --git a/openstack/python-ironicclient/python-ironicclient.spec.j2 b/openstack/python-ironicclient/python-ironicclient.spec.j2 index 2d5bf071e..db173a76f 100644 --- a/openstack/python-ironicclient/python-ironicclient.spec.j2 +++ b/openstack/python-ironicclient/python-ironicclient.spec.j2 @@ -22,7 +22,6 @@ BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('jsonschema', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('python-openstackclient', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('os-testr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('osc-lib', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.i18n', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.utils', py_versions=['py2', 'py3']) }} @@ -31,6 +30,7 @@ BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('python-subunit', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('requests', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('requests-mock', py_versions=['py2', 'py3']) }} +BuildRequires: {{ py2pkg('stestr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('testtools', py_versions=['py2', 'py3']) }} Requires: {{ py2pkg('PrettyTable') }} Requires: {{ py2pkg('PyYAML') }} diff --git a/openstack/python-karborclient/python-karborclient.spec.j2 b/openstack/python-karborclient/python-karborclient.spec.j2 index 579f967e7..bfe5a10d1 100644 --- a/openstack/python-karborclient/python-karborclient.spec.j2 +++ b/openstack/python-karborclient/python-karborclient.spec.j2 @@ -14,7 +14,6 @@ BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('keystoneauth1') }} BuildRequires: {{ py2pkg('mock') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('osc-lib') }} BuildRequires: {{ py2pkg('oslo.i18n') }} BuildRequires: {{ py2pkg('oslo.log') }} diff --git a/openstack/python-openstackclient/python-openstackclient.spec.j2 b/openstack/python-openstackclient/python-openstackclient.spec.j2 index 02469d91b..2c50f3655 100644 --- a/openstack/python-openstackclient/python-openstackclient.spec.j2 +++ b/openstack/python-openstackclient/python-openstackclient.spec.j2 @@ -22,7 +22,6 @@ BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('python-novaclient', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('openstacksdk', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('os-client-config', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('os-testr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('osc-lib', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('osprofiler', py_versions=['py2', 'py3']) }} diff --git a/openstack/python-saharaclient/python-saharaclient.spec.j2 b/openstack/python-saharaclient/python-saharaclient.spec.j2 index f59263eaa..f7bd629df 100644 --- a/openstack/python-saharaclient/python-saharaclient.spec.j2 +++ b/openstack/python-saharaclient/python-saharaclient.spec.j2 @@ -13,7 +13,6 @@ BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('python-keystoneclient') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('openstackdocstheme') }} -BuildRequires: {{ py2pkg('os-testr') }} BuildRequires: {{ py2pkg('osc-lib') }} BuildRequires: {{ py2pkg('oslo.i18n') }} BuildRequires: {{ py2pkg('oslo.log') }} @@ -24,6 +23,7 @@ BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('requests') }} BuildRequires: {{ py2pkg('requests-mock') }} BuildRequires: {{ py2pkg('setuptools') }} +BuildRequires: {{ py2pkg('stestr') }} BuildRequires: {{ py2pkg('testrepository') }} Requires: {{ py2pkg('Babel') }} Requires: {{ py2pkg('PrettyTable') }} @@ -71,7 +71,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %check # we don't want to depend on hacking/flake8/pep8 rm -v saharaclient/tests/unit/test_hacking.py -ostestr +python2 -m stestr.cli run %files %license LICENSE diff --git a/openstack/python-senlinclient/python-senlinclient.spec.j2 b/openstack/python-senlinclient/python-senlinclient.spec.j2 index 2548d6d82..bcb1ab621 100644 --- a/openstack/python-senlinclient/python-senlinclient.spec.j2 +++ b/openstack/python-senlinclient/python-senlinclient.spec.j2 @@ -21,7 +21,6 @@ BuildRequires: {{ py2pkg('python-heatclient', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('python-openstackclient', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('openstacksdk', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('os-testr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('osc-lib', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.i18n', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.serialization', py_versions=['py2', 'py3']) }} diff --git a/openstack/vmware-nsx/vmware-nsx.spec.j2 b/openstack/vmware-nsx/vmware-nsx.spec.j2 index 2a8a720cb..8fd6aa931 100644 --- a/openstack/vmware-nsx/vmware-nsx.spec.j2 +++ b/openstack/vmware-nsx/vmware-nsx.spec.j2 @@ -16,7 +16,6 @@ BuildRequires: {{ py2pkg('neutron-lib') }} BuildRequires: {{ py2pkg('oslo.vmware') }} BuildRequires: {{ py2pkg('tooz') }} BuildRequires: {{ py2pkg('mock', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('os-testr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.log', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('requests-mock', py_versions=['py2', 'py3']) }}