Package: umockdev
Version: Autopkgtest failure
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu mantic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
d/p/test-Allow-missing-.X11-unix-X5-file.patch
Thanks for considering the patch.
-- System Information:
Debian Release: bookworm/sid
APT prefers mantic
APT policy: (500, 'mantic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.2.0-21-generic (SMP w/32 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru umockdev-0.17.17/debian/patches/series
umockdev-0.17.17/debian/patches/series
--- umockdev-0.17.17/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ umockdev-0.17.17/debian/patches/series 2023-05-11 09:20:46.000000000
+0200
@@ -0,0 +1 @@
+test-Allow-missing-.X11-unix-X5-file.patch
diff -Nru
umockdev-0.17.17/debian/patches/test-Allow-missing-.X11-unix-X5-file.patch
umockdev-0.17.17/debian/patches/test-Allow-missing-.X11-unix-X5-file.patch
--- umockdev-0.17.17/debian/patches/test-Allow-missing-.X11-unix-X5-file.patch
1970-01-01 01:00:00.000000000 +0100
+++ umockdev-0.17.17/debian/patches/test-Allow-missing-.X11-unix-X5-file.patch
2023-05-11 09:21:19.000000000 +0200
@@ -0,0 +1,36 @@
+From: Heinrich Schuchardt <xypron.g...@gmx.de>
+Date: Wed, 10 May 2023 18:22:12 +0200
+Subject: [PATCH 1/1] test: Allow missing .X11-unix/X5 file
+
+Testing fails with
+
+ cannot remove /tmp/.X11-unix/X5: No such file or directory
+
+Fixes: 0f686e11540c ("Check FileUtils.{remove,unlink}() return code")
+
+Fixes #208
+https://launchpad.net/bugs/2019122
+
+Signed-off-by: Heinrich Schuchardt <heinrich.schucha...@canonical.com>
+Origin:
https://github.com/martinpitt/umockdev/commit/e3a0383ebd15391e08549ceb8be9053315e15fc1
+---
+ tests/test-umockdev-run.vala | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test-umockdev-run.vala b/tests/test-umockdev-run.vala
+index 6b2b23c..81fd7b0 100644
+--- a/tests/test-umockdev-run.vala
++++ b/tests/test-umockdev-run.vala
+@@ -593,7 +593,8 @@ t_input_touchpad ()
+ // clean up lockfile after killed X server
+ if (FileUtils.remove ("/tmp/.X5-lock") < 0)
+ debug("failed to clean up /tmp/.X5-lock: %m");
+- checked_remove ("/tmp/.X11-unix/X5");
++ if (FileUtils.remove ("/tmp/.X11-unix/X5") < 0)
++ debug("failed to clean up .X11-unix/X5: %m");
+
+ assert_cmpstr (xinput_err, CompareOperator.EQ, "");
+ assert_cmpint (xinput_exit, CompareOperator.EQ, 0);
+--
+2.39.2
+
