Commit 17dd2383 authored by Thomas Goirand's avatar Thomas Goirand

Removed fix-py36-compatibility.patch applied upstream.

parent 1796a815
......@@ -2,6 +2,7 @@ octavia (4.0.0~rc1-1) experimental; urgency=medium
* New upstream release.
* Fixed (build-)depends for this release.
* Removed fix-py36-compatibility.patch applied upstream.
-- Thomas Goirand <zigo@debian.org> Fri, 29 Mar 2019 15:53:42 +0100
......
Description: Fix compat with Python >= 3.6
Provide a sane return value for get_keepalivedlvs_pid
to ensure that underlying Python libary code does not
hrow a TypeError when joining values:
TypeError: join() argument must be str or bytes, not 'MagicMock'
Author: James Page <james.page@ubuntu.com>
Date: Sat, 18 Aug 2018 03:20:48 +0000
Change-Id: I174bbaf618a845cc246f3b1926d600d03e710de3
Origin: upstream, https://review.openstack.org/#/c/592829/
Last-Update: 2018-08-29
diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py
index e0359a68..d180d9d1 100644
--- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py
+++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py
@@ -61,6 +61,7 @@ class KeepalivedLvsTestCase(base.TestCase):
m_check_output, mget_pid,
m_init_sys):
m_exist.return_value = True
+ mget_pid.return_value = '0'
self.assertRaises(
util.UnknownInitError, self.test_keepalivedlvs.delete_udp_listener,
self.FAKE_ID)
fix-py36-compatibility.patch
install-missing-files.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment