diff --git a/openstack/ovsdbapp/0001-Fix-thread-threading-change-in-unit-test.patch b/openstack/ovsdbapp/0001-Fix-thread-threading-change-in-unit-test.patch new file mode 100644 index 000000000..16e64f5a0 --- /dev/null +++ b/openstack/ovsdbapp/0001-Fix-thread-threading-change-in-unit-test.patch @@ -0,0 +1,38 @@ +From 48ee1008f59eed95cbca7a8b1b3630ddbffdaae5 Mon Sep 17 00:00:00 2001 +From: Terry Wilson +Date: Fri, 24 Jul 2020 16:42:17 -0500 +Subject: [PATCH] Fix thread/threading change in unit test + +This unit test was not updated when the thread/threading name +change happened. This fixes the unit test when eventlet is +installed. + +Change-Id: I0e0da83187190c7145bb01f77daf22a43868115c +Closes-bug: #1875678 +--- + ovsdbapp/tests/unit/test_api.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ovsdbapp/tests/unit/test_api.py b/ovsdbapp/tests/unit/test_api.py +index 897a955..8bb7921 100644 +--- a/ovsdbapp/tests/unit/test_api.py ++++ b/ovsdbapp/tests/unit/test_api.py +@@ -44,12 +44,12 @@ except ImportError: + class GreenThreadingFixture(fixtures.Fixture): + def _setUp(self): + if 'eventlet' in sys.modules: +- self._orig = api.thread.get_ident +- api.thread.get_ident = thread.get_ident ++ self._orig = api.threading.get_ident ++ api.threading.get_ident = thread.get_ident + self.addCleanup(self.cleanup) + + def cleanup(self): +- api.thread.get_ident = self._orig ++ api.threading.get_ident = self._orig + + + class FakeTransaction(object): +-- +2.27.0 + diff --git a/openstack/ovsdbapp/ovsdbapp.spec.j2 b/openstack/ovsdbapp/ovsdbapp.spec.j2 index c192f8fb5..4636075b2 100644 --- a/openstack/ovsdbapp/ovsdbapp.spec.j2 +++ b/openstack/ovsdbapp/ovsdbapp.spec.j2 @@ -1,6 +1,6 @@ %define with_tests 1 {% set pypi_name = 'ovsdbapp' %} -{% set upstream_version = upstream_version('1.2.0') %} +{% set upstream_version = upstream_version('1.3.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} Name: {{ py2name() }} @@ -11,6 +11,8 @@ License: {{ license('Apache-2.0') }} Group: Development/Languages/Python URL: https://launchpad.net/{{ pypi_name }} Source0: {{ source }} +# From https://review.opendev.org/#/c/743001/ +Patch1: 0001-Fix-thread-threading-change-in-unit-test.patch BuildRequires: openstack-macros BuildRequires: {{ py3('fixtures') }} BuildRequires: {{ py3('netaddr') }} @@ -65,7 +67,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %if 0%{?with_tests} %check -OS_TEST_PATH=./ovsdbapp/tests/unit python3 -m stestr.cli run +OS_TEST_PATH=./ovsdbapp/tests/unit PYTHONPATH=. python3 -m stestr.cli run %endif %files -n {{ py2name(py_versions='py3') }}