Merge ~vpa1977/ubuntu/+source/zict:test_upstream_patch into ubuntu/+source/zict:ubuntu/devel

[Vladimir Petko]

Changes:
 - apply upstream test patch for single-cpu machines.

PPA: ppa:vpa1977/plusone [1]

Testing:
 - piuparts tests (see comment)
---
0m57.3s INFO: PASS: All tests.
0m57.3s INFO: piuparts run ends.
----
 - autopkgtest on ppc64el succeeds [2]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+packages
[2] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-vpa1977-plusone/mantic/ppc64el/z/zict/20231002_000508_7b9c9@/log.gz

[Vladimir Petko (vpa1977)]

~/piutest.sh --warn-on-others --warn-on-leftovers-after-purge python3-zict
[sudo] password for vladimirp:
0m0.0s INFO: ------------------------------------------------------------------------------
0m0.0s INFO: To quickly glance what went wrong, scroll down to the bottom of this logfile.
0m0.0s INFO: FAQ available at https://wiki.debian.org/piuparts/FAQ
0m0.0s INFO: The FAQ also explains how to contact us in case you think piuparts is wrong.
0m0.0s INFO: ------------------------------------------------------------------------------
0m0.0s INFO: piuparts version 1.1.7 starting up.
0m0.0s INFO: Command line arguments: /usr/sbin/piuparts --scriptsdir=/home/vladimirp/piuscripts --apt -d mantic '--extra-repo=deb http://nz.archive.ubuntu.com/ubuntu/ mantic universe' --warn-on-others --warn-on-leftovers-after-purge python3-zict
0m0.0s INFO: Running on: Linux vladimirp 6.2.0-33-generic #33-Ubuntu SMP PREEMPT_DYNAMIC Tue Sep 5 14:49:19 UTC 2023 x86_64
0m0.0s DEBUG: Created temporary directory /tmp/tmpwq80hmat
0m0.0s DEBUG: Setting up minimal chroot for mantic at /tmp/tmpwq80hmat.
0m0.0s DEBUG: Starting command: ['eatmydata', 'debootstrap', '--variant=minbase', '--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg', '--include=eatmydata', '--no-merged-usr', '--components=main,restricted', 'mantic', '/tmp/tmpwq80hmat', 'http://nz.archive.ubuntu.com/ubuntu/']
0m30.2s DUMP:
  I: Target architecture can be executed
  I: Retrieving InRelease
  I: Checking Release signature
  I: Valid Release signature (key id F6ECB3762474EDA9D21B7022871920D1991BC93C)
  I: Retrieving Packages
  I: Validating Packages
  I: Retrieving Packages
  I: Validating Packages
  I: Resolving dependencies of required packages...
  I: Resolving dependencies of base packages...
  I: Checking component main on http://nz.archive.ubuntu.com/ubuntu...
  I: Retrieving apt 2.7.3
  I: Validating apt 2.7.3
  I: Retrieving base-files 13ubuntu1
  I: Validating base-files 13ubuntu1
  I: Retrieving base-passwd 3.6.1
  I: Validating base-passwd 3.6.1
  I: Retrieving bash 5.2.15-2ubuntu1
  I: Validating bash 5.2.15-2ubuntu1
  I: Retrieving bsdutils 1:2.39.1-4ubuntu1
  I: Validating bsdutils 1:2.39.1-4ubuntu1
  I: Retrieving coreutils 9.1-1ubuntu2
  I: Validating coreutils 9.1-1ubuntu2
  I: Retrieving dash 0.5.12-6ubuntu1
  I: Validating dash 0.5.12-6ubuntu1
  I: Retrieving debconf 1.5.82
  I: Validating debconf 1.5.82
  I: Retrieving debianutils 5.8-1
  I: Validating debianutils 5.8-1
  I: Retrieving diffutils 1:3.8-4
  I: Validating diffutils 1:3.8-4
  I: Retrieving dpkg 1.22.0ubuntu1
  I: Validating dpkg 1.22.0ubuntu1
  I: Retrieving e2fsprogs 1.47.0-2ubuntu1
  I: Validating e2fsprogs 1.47.0-2ubuntu1
  I: Retrieving eatmydata 131-1
  I: Validating eatmydata 131-1
  I: Retrieving findutils 4.9.0-5
  I: Validating findutils 4.9.0-5
  I: Retrieving gcc-13-base 13.2.0-4ubuntu3
  I: Validating gcc-13-base 13.2.0-4ubuntu3
  I: Retrieving gpgv 2.2.40-1.1ubuntu1
  I: Validating gpgv 2.2.40-1.1ubuntu1
  I: Retrieving grep 3.11-2
  I: Validating grep 3.11-2
  I: Retrieving gzip 1.12-1ubuntu1
  I: Validating gzip 1.12-1ubuntu1
  I: Retrieving hostname 3.23+nmu1ubuntu1
  I: Validating hostname 3.23+n...

[Vladimir Petko (vpa1977)]

Autopkgtests results:
  - zict/3.0.0-2ubuntu1~ppa1
    + ✅ zict on mantic for amd64 @ 02.10.23 21:11:51 Log️ 🗒️
    + ✅ zict on mantic for arm64 @ 02.10.23 21:18:32 Log️ 🗒️
    + ✅ zict on mantic for armhf @ 02.10.23 21:14:30 Log️ 🗒️
    + ✅ zict on mantic for ppc64el @ 02.10.23 00:05:08 Log️ 🗒️
    + ✅ zict on mantic for s390x @ 02.10.23 22:30:39 Log️ 🗒️

[Dan Bungert (dbungert)]

Uploading

review: Approve

Unmerged commits

fc02131... by Vladimir Petko on 2023-10-01

changelog

af890f7... by Vladimir Petko on 2023-10-01

update-maintainer

8472e3d... by Vladimir Petko on 2023-10-01

  * Prevent test timeout on a single CPU (LP: #2033759).

diff --git a/debian/changelog b/debian/changelog
index 07b9b89..7b456d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zict (3.0.0-2ubuntu1) mantic; urgency=medium
+
+  * Prevent test timeout on a single CPU (LP: #2033759).
+
+ -- Vladimir Petko <[e-mail]>  Mon, 02 Oct 2023 11:54:38 +1300
+
 zict (3.0.0-2) unstable; urgency=medium
 
   * Add update-pytest-markers.patch to list repeat marker
diff --git a/debian/control b/debian/control
index 53dbf0c..adb9589 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: zict
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Diane Trout <[e-mail]>,
 Build-Depends:
diff --git a/debian/patches/prevent_test_timeout_on_single_cpu.patch b/debian/patches/prevent_test_timeout_on_single_cpu.patch
new file mode 100644
index 0000000..fb38ae1
--- /dev/null
+++ b/debian/patches/prevent_test_timeout_on_single_cpu.patch
@@ -0,0 +1,20 @@
+Description: Prevent test timeout on a single CPU
+ When running on a single CPU (`taskset -c 0 pytest`), multitasking can
+ misbehave and almost completely starve one of the two threads
+Origin: upstream, https://github.com/dask/zict/pull/108/files
+Bug: https://github.com/dask/zict/pull/108
+Bug-Ubuntu: https://launchpad.net/bugs/2033759
+Last-Update: 2023-10-02
+--- a/zict/tests/utils_test.py
++++ b/zict/tests/utils_test.py
+@@ -169,7 +169,9 @@
+ 
+     def worker(idx, key, value):
+         barrier.wait()
+-        while any(c < 10 for c in counters):
++        # When running on a single CPU (`taskset -c 0 pytest`), multitasking can
++        # misbehave and almost completely starve one of the two threads
++        while any(c < 10 for c in counters) and all(c < 1000 for c in counters):
+             z[key] = value
+             try:
+                 assert z[key] == value
diff --git a/debian/patches/series b/debian/patches/series
index 8e42b0d..52b1c25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 update-pytest-markers.patch
+prevent_test_timeout_on_single_cpu.patch