Bug#1063711: mumble: autopkgtest fixes

2024-04-05 Thread Chris Knadle

Hello Diederik.

Thanks for working on the autopkg test failure and including patches -- 
I'm about to try to incorporate them.


I also pushed the Mumble 1.5.517 release from my local Git to Salsa; 
sorry I missed that.


I wasn't in the Debian VoIP Packaging Team mailing list, so that's how I 
missed these bugs for a couple of months.


I'm under heavy life burden right now but I hope I'm turning the corner 
and will be able to free up some time in a few weeks.


Thanks

   -- Chris

--
Chris Knadle
chris.kna...@coredump.us



Bug#1063711: mumble: autopkgtest fixes (fixes #1062798)

2024-02-11 Thread Diederik de Haas
Source: mumble
Version: 1.5.517-1
Severity: normal
Tags: patch
X-Debbugs-Cc: 1062...@bugs.debian.org

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

I made some patches which fixed the autopkgtest failures in my Salsa's
CI pipeline, which should fix the problem as reported in #1062798 about
mumble not transitioning to Testing due to autopkgtest failures.
I'm not sure how to deal with bugs like 1062798 as it's already
(immediately) closed, hence this separate bug.

As the released version isn't available on Salsa I haven't been able to
test whether it applies cleanly on the released version, but I think it
does. Otherwise it should contain the clues needed to fix it properly.

Cheers,
  Diederik

- -- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (101, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.6.13-amd64 (SMP w/16 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-BEGIN PGP SIGNATURE-

iHUEARYIAB0WIQT1sUPBYsyGmi4usy/XblvOeH7bbgUCZcjZDQAKCRDXblvOeH7b
bg4bAQDunBxsV2mW/2MBftkaGikwal4ohr8UDB6q+f8clwHCyQD/WUyTgCg7W7E/
6+IgJ7KLVdDVyVNaOogSyRQNDluUmAY=
=u+Ks
-END PGP SIGNATURE-
>From ca324636bd152a418f5f7a60c166a4ea30d4e37b Mon Sep 17 00:00:00 2001
From: Diederik de Haas 
Date: Mon, 6 Mar 2023 11:56:30 +0100
Subject: [PATCH 1/3] d/tests/control: Add xauth as dependency

It's 'only' a Recommends of xvfb, but the autopkgtest fails because
xvfb-run needs the xauth program.
---
 debian/tests/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/control b/debian/tests/control
index 9934595..19c2c04 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
 Tests: smoke
-Depends: mumble, mumble-server, xvfb
+Depends: mumble, mumble-server, xvfb, xauth
-- 
2.43.0

>From f566c8afb0ded43e056fc8439d95982448e566eb Mon Sep 17 00:00:00 2001
From: Diederik de Haas 
Date: Mon, 6 Mar 2023 12:23:10 +0100
Subject: [PATCH 2/3] d/tests/smoke: Add missing closing ')' to SERVER_VERSION

---
 debian/tests/smoke | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/smoke b/debian/tests/smoke
index b3ecdc5..aef796c 100755
--- a/debian/tests/smoke
+++ b/debian/tests/smoke
@@ -28,7 +28,7 @@ else
 fi
 
 echo "Executing /usr/bin/mumble-server --version"
-SERVER_VERSION=$(/usr/bin/mumble-server --version | grep "Mumble server 
version [0-9]\.[0-9]\.[0-9]"
+SERVER_VERSION=$(/usr/bin/mumble-server --version | grep "Mumble server 
version [0-9]\.[0-9]\.[0-9]")
 if [ -n "$SERVER_VERSION" ] ; then
echo "Found: $SERVER_VERSION"
 else
-- 
2.43.0

>From 4c4c473bb4e2185b5f493e0bc49c0de1d41f4789 Mon Sep 17 00:00:00 2001
From: Diederik de Haas 
Date: Fri, 18 Aug 2023 18:41:59 +0200
Subject: [PATCH 3/3] d/tests/smoke: Create Mumble dir in $HOME for 'mumble 
--version'

For some reason it needs $HOME/.local/share/data/Mumble to determine its
version and it outputs creating that dir which autopkgtest doesn't like.
And it reports to stderr that it migrated a dir (on fresh install), so
send stderr to `/dev/null`.

Link: https://github.com/mumble-voip/mumble/issues/6193
---
 debian/tests/smoke | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/tests/smoke b/debian/tests/smoke
index aef796c..cabb446 100755
--- a/debian/tests/smoke
+++ b/debian/tests/smoke
@@ -18,8 +18,12 @@ echo "Starting basic smoke test."
 ##   qt.qpa.xcb: could not connect to display
 ## This test is commented out until the required test dependencies are found
 ##
+# Reported upstream: https://github.com/mumble-voip/mumble/issues/6193
+echo "Create $HOME/.local/share/data/Mumble needed for 'mumble --version'"
+mkdir -p $HOME/.local/share/data/Mumble
+
 echo "Executing /usr/bin/mumble --version"
-MUMBLE_VERSION=$(/usr/bin/xvfb-run -a /usr/bin/mumble --version | grep "Mumble 
version [0-9]\.[0-9]\.[0-9]")
+MUMBLE_VERSION=$(/usr/bin/xvfb-run -a /usr/bin/mumble --version 2>/dev/null | 
grep "Mumble version [0-9]\.[0-9]\.[0-9]")
 if [ -n "$MUMBLE_VERSION" ] ; then
echo "Found: $MUMBLE_VERSION"
 else
-- 
2.43.0