Merge ~paelzer/ubuntu/+source/crmsh:fix-python3.8-focal into ubuntu/+source/crmsh:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3903/+packages
Bug: https://bugs.launchpad.net/ubuntu/+source/crmsh/+bug/1861270
Upsteam: https://github.com/ClusterLabs/crmsh/commit/c6b15764786b3a28502070a35fd0f433d2aa3cbc

[Christian Ehrhardt  (paelzer)]

I'll update with test results once ready.

[Christian Ehrhardt  (paelzer)]

Tests results seem ok
https://bileto.ubuntu.com/excuses/3903/focal.html

Using python3.8 and having the testsuite pass.

i386 always fails on bileto but isn't a real issue.

But I'm still slightly concernd as a local run was broken on
-------------------- >> begin captured stdout << ---------------------
ERROR: parse_time 2017-01-26T11:04:19.562885+08:00 12sp2-4 kernel:: ('Unknown string format:', '2017-01-26T11:04:19.562885+08:00 12sp2-4 kernel:')
INFO: autopkgtest# the log file is in the rfc5424 format

I'd appreciate if a reviewer could double check that.

[Christian Ehrhardt  (paelzer)]

I tested --apt-pocket=proposed=src:python3-defaults vs another run without locally.
They both fail the same way.

But since on the autopkgtest-infra all is fine I think we can go on with this.
I'd appreciate a review to one-by-one reduce the py3-explosion in proposed-migration :-)

[Andreas Hasenack (ahasenack)]

FWIW, I didn't see the parse_time error in my local dep8 run with your built packages and proposed enabled.

I noticed regression tests have their result ignored, a change introduced in 4.0.0~git20190108.3d56538-3 by debian:

./regression.sh -m buildbot || true

And indeed there are some failures. But let's leave it at that for now.

+1 on this branch.

review: Approve

[Christian Ehrhardt  (paelzer)]

Yeah, our issue was on
  nosetests3 -w ./unittests -v 2>&1
which isn't || true

Thanks for the checks!

[Christian Ehrhardt  (paelzer)]

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

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading crmsh_4.2.0-2ubuntu1.dsc: done.
  Uploading crmsh_4.2.0-2ubuntu1.debian.tar.xz: done.
  Uploading crmsh_4.2.0-2ubuntu1_source.buildinfo: done.
  Uploading crmsh_4.2.0-2ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 33aeff2..ddbe74b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+crmsh (4.2.0-2ubuntu1) focal; urgency=medium
+
+  * d/p/scripts-python3.8-unittest-compatibility.patch: fix tests
+    with python3.8 (LP: #1861270)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 29 Jan 2020 11:36:26 +0100
+
 crmsh (4.2.0-2) unstable; urgency=medium
 
   * d/patches: fix tests failing in 2020
diff --git a/debian/control b/debian/control
index b415a15..8ae1bca 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: crmsh
 Section: admin
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders:
  Richard B Winters <[e-mail]>,
  Adrian Vondendriesch <[e-mail]>,
diff --git a/debian/patches/scripts-python3.8-unittest-compatibility.patch b/debian/patches/scripts-python3.8-unittest-compatibility.patch
new file mode 100644
index 0000000..010ee2a
--- /dev/null
+++ b/debian/patches/scripts-python3.8-unittest-compatibility.patch
@@ -0,0 +1,68 @@
+From c6b15764786b3a28502070a35fd0f433d2aa3cbc Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Tue, 28 Jan 2020 13:23:59 +0200
+Subject: [PATCH] scripts: python3.8 unittest compatibility
+
+When the unitetss are run with python 3.8 they break on changes in ast.
+  File "/usr/lib/python3/dist-packages/crmsh/minieval.py", line 222, in _eval
+    handler = self.nodes[type(node)]
+  KeyError: <class '_ast.Constant'>
+
+This is due to [1] which states "Class ast.Constant is now used for all
+constants. Old classes ast.Num, ast.Str, ast.Bytes, ast.NameConstant and
+ast.Ellipsis are still available, but they will be removed in future
+Python releases.".
+Even thou this is just the deprecation it already triggers an error
+in the tests of crmsh.
+
+[1]: https://docs.python.org/3/library/ast.html#ast.AST
+
+Fixes #518
+
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+
+Origin: upstream, https://github.com/ClusterLabs/crmsh/commit/c6b15764786b3a28502070a35fd0f433d2aa3cbc
+Last-Update: 2020-01-29
+
+---
+ crmsh/minieval.py | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/crmsh/minieval.py b/crmsh/minieval.py
+index 4403d092..06e780c2 100644
+--- a/crmsh/minieval.py
++++ b/crmsh/minieval.py
+@@ -200,10 +200,14 @@ class SimpleEval(object):  # pylint: disable=too-few-public-methods
+ 
+         # py3k stuff:
+         if hasattr(ast, 'NameConstant'):
+-            self.nodes[ast.NameConstant] = self._eval_nameconstant
++            self.nodes[ast.NameConstant] = self._eval_constant
+         elif isinstance(self.names, dict) and "None" not in self.names:
+             self.names["None"] = None
+ 
++        # py3.8 uses ast.Constant instead of ast.Num, ast.Str, ast.NameConstant
++        if hasattr(ast, 'Constant'):
++            self.nodes[ast.Constant] = self._eval_constant
++
+     def evaluate(self, expr):
+         """ evaluate an expresssion, using the operators, functions and
+             names previously set up. """
+@@ -239,7 +243,13 @@ class SimpleEval(object):  # pylint: disable=too-few-public-methods
+         return node.s
+ 
+     @staticmethod
+-    def _eval_nameconstant(node):
++    def _eval_constant(node):
++        if (hasattr(node.value, '__len__') and
++                len(node.value) > MAX_STRING_LENGTH):
++            raise IterableTooLong("Literal in statement is too long!"
++                                  " ({0}, when {1} is max)"
++                                  "".format(len(node.value),
++                                            MAX_STRING_LENGTH))
+         return node.value
+ 
+     def _eval_unaryop(self, node):
+-- 
+2.25.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 678549f..d25fab3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0014-Fix-cluster-stop-start.patch
 0015-Fix-testsuite-errors.patch
 0016-Fix-python2-calls.patch
+scripts-python3.8-unittest-compatibility.patch