Bug#986915: unblock: pexpect/4.8.0-2

[Gordon Ball <gordon@chronitis.net>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package pexpect

(not yet uploaded to unstable)

[ Reason ]
#986727: flaky autopkgtests

[ Impact ]
Failing autopkgtests in stable causing problems for stable updates,
unnecessary noise, etc

[ Tests ]
Built and ran the autopkgtest 15 times in a loop without failures after
these changes.

[ Risks ]
Affects autopkgtest only, should have no regression potential.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
https://salsa.debian.org/python-team/packages/pexpect/-/compare/debian%2F4.8.0-1...master

unblock pexpect/4.8.0-2

diff -Nru pexpect-4.8.0/debian/changelog pexpect-4.8.0/debian/changelog
--- pexpect-4.8.0/debian/changelog	2021-01-04 19:51:00.000000000 +0000
+++ pexpect-4.8.0/debian/changelog	2021-04-13 08:20:51.000000000 +0000
@@ -1,3 +1,10 @@
+pexpect (4.8.0-2) UNRELEASED; urgency=medium
+
+  * Skip several flaky tests, both for build and autopkgtest (Closes: #986727)
+  * Fix broken URL in d/watch
+
+ -- Gordon Ball <gordon@chronitis.net>  Tue, 13 Apr 2021 08:20:51 +0000
+
 pexpect (4.8.0-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru pexpect-4.8.0/debian/rules pexpect-4.8.0/debian/rules
--- pexpect-4.8.0/debian/rules	2021-01-04 19:51:00.000000000 +0000
+++ pexpect-4.8.0/debian/rules	2021-04-13 08:20:51.000000000 +0000
@@ -5,7 +5,13 @@
 # replwrap has issues when wrapping a readline-enabled command when
 # bracketed-paste mode is enabled, which results in extra escape sequences
 # pexpect isn't... expecting
-export PYBUILD_TEST_ARGS = -k 'not (pxssh or replwrap)'
+# test_beforeacross_chunks seems to contain a race condition as to whether
+# the captured output contains a newline or not, which it then asserts
+# test_spawn_uses_env appears to rarely fail with no exit code (also a race?)
+export PYBUILD_TEST_ARGS = -k 'not (pxssh or replwrap or test_before_across_chunks or test_spawn_uses_env)'
+
+# this skips two further tests upstream knows to be flaky in their CI
+export TRAVIS = 1
 
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
diff -Nru pexpect-4.8.0/debian/tests/control pexpect-4.8.0/debian/tests/control
--- pexpect-4.8.0/debian/tests/control	2021-01-04 19:51:00.000000000 +0000
+++ pexpect-4.8.0/debian/tests/control	2021-04-13 08:20:51.000000000 +0000
@@ -1,2 +1,2 @@
-Test-Command: python3 -m pytest -k 'not (pxssh or replwrap)' tests
+Tests: pytest
 Depends: @, python3-pytest, openssl
diff -Nru pexpect-4.8.0/debian/tests/pytest pexpect-4.8.0/debian/tests/pytest
--- pexpect-4.8.0/debian/tests/pytest	1970-01-01 00:00:00.000000000 +0000
+++ pexpect-4.8.0/debian/tests/pytest	2021-04-13 08:20:51.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+# used upstream to flag some tests as flaky in CI
+export TRAVIS=1
+
+# copy the tests out of the source tree to use the installed lib
+cp -r tests $AUTOPKGTEST_TMP
+cd $AUTOPKGTEST_TMP
+
+# see d/rules for comments on why these tests are skipped
+python3 -m pytest -k 'not (pxssh or replwrap or test_before_across_chunks or test_spawn_uses_env)' tests
diff -Nru pexpect-4.8.0/debian/watch pexpect-4.8.0/debian/watch
--- pexpect-4.8.0/debian/watch	2021-01-04 19:51:00.000000000 +0000
+++ pexpect-4.8.0/debian/watch	2021-04-13 08:20:51.000000000 +0000
@@ -1,3 +1,3 @@
 version=4
 opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
-https://github.com/pexpect/pexpect/tags .*/archive/@ANY_VERSION@@ARCHIVE_EXT@
+https://github.com/pexpect/pexpect/tags .*/@ANY_VERSION@@ARCHIVE_EXT@