Merge ~liushuyu-011/ubuntu/+source/aptdaemon:ubuntu/devel into ubuntu/+source/aptdaemon:ubuntu/devel

[Zixing Liu]

This merge proposal fixes aptdaemon after the Python 3.12 transition, where setuptools no longer provides test driver functionality.

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16496372/+listing-archive-extra

[Vladimir Petko (vpa1977)]

Would it be possible to raise a bug / link existing setuptool bug in the changelog?

review: Needs Information

[Zixing Liu (liushuyu-011)]

> Would it be possible to raise a bug / link existing setuptool bug in the changelog?

It seems to have been previously missed from the Python 3.12 transition tracking.

[Vladimir Petko (vpa1977)]

Uploaded, thank you!!!

Minor nit: added punctuation in the changelog.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 96dbe65..98d9f26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+aptdaemon (1.1.1+bzr982-0ubuntu46) oracular; urgency=medium
+
+  * Fix build-time tests (LP: #2082000)
+    - d/rules: Use nosetest3 as the test driver as setuptools has 
+      removed test command.
+    - d/rules: Disabled cdrom tests, as they are very flaky
+
+ -- Zixing Liu <[e-mail]>  Thu, 19 Sep 2024 12:35:48 -0600
+
 aptdaemon (1.1.1+bzr982-0ubuntu45) oracular; urgency=medium
 
   * Fix invalid escape sequences (LP: #2071678).
diff --git a/debian/rules b/debian/rules
index 9c56cfb..2033a19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 test-python%:
 	# wait until previous xvfb-run has finished
 	while [ -e /tmp/.X99-lock ]; do sleep 1; done
-	xvfb-run python$* setup.py test -vv
+	xvfb-run nosetests3 --process-restartworker --process-timeout=60 --exclude=test_cdrom
 
 override_dh_auto_test: $(PYTHON3:%=test-python%)
 endif