diff -Nru python-magnumclient-2.11.0/debian/changelog python-magnumclient-2.11.0/debian/changelog --- python-magnumclient-2.11.0/debian/changelog 2019-07-12 12:35:37.000000000 +0000 +++ python-magnumclient-2.11.0/debian/changelog 2020-04-03 10:53:04.000000000 +0000 @@ -1,3 +1,11 @@ +python-magnumclient (2.11.0-0ubuntu4) focal; urgency=medium + + * d/p/skip-tests.patch: Refresh patch to ensure that tests are skipped + for >= Python 3.7 rather than == (LP: #1870076). + * d/rules: Set PBR_VERSION to fix failing shell tests. + + -- James Page Fri, 03 Apr 2020 11:53:04 +0100 + python-magnumclient (2.11.0-0ubuntu3) eoan; urgency=medium * d/control: Fix BD's on python-* packages for Bionic Train. diff -Nru python-magnumclient-2.11.0/debian/patches/skip-tests.patch python-magnumclient-2.11.0/debian/patches/skip-tests.patch --- python-magnumclient-2.11.0/debian/patches/skip-tests.patch 2019-07-12 12:35:37.000000000 +0000 +++ python-magnumclient-2.11.0/debian/patches/skip-tests.patch 2020-04-03 10:53:04.000000000 +0000 @@ -17,8 +17,8 @@ url = client._make_connection_url('v1/resources') self.assertEqual('/v1/resources', url) -+ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7, -+ "bug/1785284: Skipped by Ubuntu, tests fail for Python 3.7") ++ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor >= 7, ++ "bug/1785284: Skipped by Ubuntu, tests fail for Python >= 3.7") def test_server_exception_empty_body(self): error_body = _get_error_body() fake_resp = utils.FakeResponse({'content-type': 'application/json'}, @@ -26,8 +26,8 @@ 'GET', '/v1/resources') self.assertEqual('Internal Server Error (HTTP 500)', str(error)) -+ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7, -+ "bug/1785284: Skipped by Ubuntu, tests fail for Python 3.7") ++ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor >= 7, ++ "bug/1785284: Skipped by Ubuntu, tests fail for Python >= 3.7") def test_server_exception_msg_only(self): error_msg = 'test error msg' error_body = _get_error_body(error_msg, err_type=ERROR_DICT) @@ -35,8 +35,8 @@ 'GET', '/v1/resources') self.assertEqual(error_msg + ' (HTTP 500)', str(error)) -+ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7, -+ "bug/1785284: Skipped by Ubuntu, tests fail for Python 3.7") ++ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor >= 7, ++ "bug/1785284: Skipped by Ubuntu, tests fail for Python >= 3.7") def test_server_exception_msg_and_traceback(self): error_msg = 'another test error' error_trace = ("\"Traceback (most recent call last):\\n\\n " @@ -44,8 +44,8 @@ self.assertRaises(exc.EndpointException, http.HTTPClient.get_connection_params, endpoint) -+ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7, -+ "bug/1785284: Skipped by Ubuntu, tests fail for Python 3.7") ++ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor >= 7, ++ "bug/1785284: Skipped by Ubuntu, tests fail for Python >= 3.7") def test_401_unauthorized_exception(self): error_body = _get_error_body(err_type=ERROR_LIST_WITH_DETAIL) fake_resp = utils.FakeResponse({'content-type': 'text/plain'}, @@ -53,8 +53,8 @@ self.assertRaises(MultipleChoices, client.json_request, 'GET', '/v1/resources') -+ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7, -+ "bug/1785284: Skipped by Ubuntu, tests fail for Python 3.7") ++ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor >= 7, ++ "bug/1785284: Skipped by Ubuntu, tests fail for Python >= 3.7") def test_server_body_undecode_json(self): err = "foo" fake_resp = utils.FakeResponse( @@ -62,8 +62,8 @@ self.assertEqual(resp, fake_resp) self.assertIsNone(body) -+ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7, -+ "bug/1785284: Skipped by Ubuntu, tests fail for Python 3.7") ++ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor >= 7, ++ "bug/1785284: Skipped by Ubuntu, tests fail for Python >= 3.7") def test_server_success_body_none(self): fake_resp = utils.FakeResponse( {'content-type': None}, @@ -71,8 +71,8 @@ self.assertEqual(resp, fake_resp) self.assertIsInstance(body, list) -+ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7, -+ "bug/1785284: Skipped by Ubuntu, tests fail for Python 3.7") ++ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor >= 7, ++ "bug/1785284: Skipped by Ubuntu, tests fail for Python >= 3.7") def test_server_success_body_json(self): err = _get_error_body() fake_resp = utils.FakeResponse( @@ -80,8 +80,8 @@ class SessionClientTest(utils.BaseTestCase): -+ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7, -+ "bug/1785284: Skipped by Ubuntu, tests fail for Python 3.7") ++ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor >= 7, ++ "bug/1785284: Skipped by Ubuntu, tests fail for Python >= 3.7") def test_server_exception_msg_and_traceback(self): error_msg = 'another test error' error_trace = ("\"Traceback (most recent call last):\\n\\n " @@ -89,8 +89,8 @@ "%(error)s\n%(details)s" % {'error': str(error), 'details': str(error.details)}) -+ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 7, -+ "bug/1785284: Skipped by Ubuntu, tests fail for Python 3.7") ++ @testtools.skipIf(sys.version_info.major == 3 and sys.version_info.minor >= 7, ++ "bug/1785284: Skipped by Ubuntu, tests fail for Python >= 3.7") def test_server_exception_empty_body(self): error_body = _get_error_body() diff -Nru python-magnumclient-2.11.0/debian/rules python-magnumclient-2.11.0/debian/rules --- python-magnumclient-2.11.0/debian/rules 2019-07-12 12:35:37.000000000 +0000 +++ python-magnumclient-2.11.0/debian/rules 2020-04-03 10:53:04.000000000 +0000 @@ -2,6 +2,8 @@ include /usr/share/openstack-pkg-tools/pkgos.make +export PBR_VERSION=$(OSLO_PACKAGE_VERSION) + %: dh $@ --buildsystem=python_distutils --with python3,sphinxdoc