Merge ~rafaeldtinoco/ubuntu/+source/pcs:lp1855568-focal into ubuntu/+source/pcs:ubuntu/focal-devel

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/pcs/+bug/1855568
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1855568

[Rafael David Tinoco (rafaeldtinoco)]

This merge restores the fixes for python3-tornado 5.1.1 into pcs.
This will unblock the migration issues with pcs for now.
I'll sync and/or merge fixes in focal whenever python3-tornado 6 is available.
For now, I need pcs in order to document Ubuntu HA stack in Ubuntu Server Guide.

[Christian Ehrhardt  (paelzer)]

Some nit picks mostly around wordings and headers.
Easy to fix and then I'm +1 on this as it functionally already LGTM.

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

LGTM now +1

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/pcs
 * [new tag] upload/0.10.4-1ubuntu1 -> upload/0.10.4-1ubuntu1

diff --git a/debian/changelog b/debian/changelog
index 3ede087..fec2308 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pcs (0.10.4-1ubuntu1) focal; urgency=medium
+
+  * Changed dependency back to python3-tornado 5.1.1 (LP: #1855568)
+    - debian/control: drop (>= 6) from python3-tornado requirement.
+    - d/p/Fix-python-tornado-5.patch: workaround that fixes python-tornado
+      until v6 becomes available.
+
+ -- Rafael David Tinoco <[e-mail]>  Sun, 08 Dec 2019 05:36:41 +0000
+
 pcs (0.10.4-1) unstable; urgency=medium
 
   * New upstream version 0.10.4
diff --git a/debian/control b/debian/control
index 4ac8a27..02508e1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pcs
 Section: admin
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders:
  Valentin Vidic <[e-mail]>
 Build-Depends:
@@ -30,7 +31,8 @@ Depends:
  python3-openssl,
  python3-pkg-resources,
  python3-pycurl,
- python3-tornado (>= 6),
+# LP: #1855568 - python3-tornado (>= 6)
+ python3-tornado,
  ruby,
  ruby-backports,
  ruby-ethon,
diff --git a/debian/patches/Fix-python-tornado-5.patch b/debian/patches/Fix-python-tornado-5.patch
 new file mode 100644
index 0000000..586bf67
--- /dev/null
+++ b/debian/patches/Fix-python-tornado-5.patch
@@ -0,0 +1,75 @@
+Description: Fix tornado 5 tests
+ Make tests work with tornado 5 until tornado 6 becomes
+ available in Debian.
+
+  [Backport Notes]
+
+  Patch was applied upstream and dropped when python3-tornado 6 became
+  available. After being dropped, python3-tornado was moved back to version 5,
+  because of python2 to python3 migration, and it exists as a fake 6 version:
+  '6.0.3+really5.1.1-2' up to today. In Ubuntu there is not a fake python3-
+  tornado package for version 6, so keeping a working version 5 is needed.
+
+Author: Valentin Vidic <[e-mail]>
+Applied-Upstream: https://salsa.debian.org/ha-team/pcs/commit/86ac09e4e09236d89af55c9a637a4f57afc1f9db
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939271
+Bug-Ubuntu: http://bugs.launchpad.net/bugs/1855568
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2019-12-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/pcs_test/tier0/daemon/app/test_app_remote.py
++++ b/pcs_test/tier0/daemon/app/test_app_remote.py
+@@ -1,4 +1,5 @@
+ import logging
++import re
+ from urllib.parse import urlencode
+ from unittest import mock
+ 
+@@ -90,15 +91,17 @@
+             else dict(method=method)
+         )
+ 
++        self.http_client.fetch(
++            self.get_url("/remote/set_sync_options"),
++            self.stop,
++            **kwargs
++        )
++
+         # Without lock the timeout should be enough to finish task. With the
+         # lock it should raise because of timeout. The same timeout is used for
+         # noticing differences between test with and test without lock.  The
+         # timeout is so short to prevent unnecessary slowdown.
+-        fetch_sync_options = lambda: self.http_client.fetch(
+-            self.get_url("/remote/set_sync_options"),
+-            **kwargs
+-        )
+-        return self.io_loop.run_sync(fetch_sync_options, timeout=0.05)
++        return self.wait(timeout=0.05)
+ 
+     def check_call_wrapper_without_lock(self, method):
+         self.assert_wrappers_response(self.fetch_set_sync_options(method))
+@@ -107,21 +110,13 @@
+         self.lock.acquire()
+         try:
+             self.fetch_set_sync_options(method)
+-        except TornadoTimeoutError:
++        except AssertionError as e:
++            self.assertTrue(re.match(".*time.*out.*", str(e)) is not None)
+             # The http_client timeouted because of lock and this is how we test
+             # the locking function. However event loop on the server side should
+             # finish. So we release the lock and the request successfully
+             # finish.
+             self.lock.release()
+-            # Now, there is an unfinished request. It was started by calling
+-            # fetch("/remote/set_sync_options") (in self.fetch_set_sync_options)
+-            # and it was waiting for the lock to be released.
+-            # The lock was released and the request is able to be finished now.
+-            # So, io_loop needs an opportunity to execute the rest of request.
+-            # Next line runs io_loop to finish hanging request. Without this an
+-            # error appears during calling
+-            # `self.http_server.close_all_connections` in tearDown...
+-            self.io_loop.run_sync(lambda: None)
+         else:
+             raise AssertionError("Timeout not raised")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f0be2e0..0ebd1b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Replace-chkconfig.patch
 Update-snmp-service-file.patch
 Fix-python-testsuite.patch
 Update-pam-config.patch
+Fix-python-tornado-5.patch