Control: tags -1 patch -- Hi,
On Sat, Apr 12, 2025 at 11:12:44AM +0300, Adrian Bunk wrote: > Source: buildd=janus > Version: 1.1.2-2 > Severity: serious > X-Debbugs-Cc: Guillem Jover <gjo...@sipwise.com> > > https://tracker.debian.org/pkg/janus > > Issues preventing migration: > ∙ ∙ autopkgtest for janus/1.1.2-2: amd64: Regression or new test ♻, arm64: > Regression or new test ♻, armel: Regression or new test ♻, armhf: Regression > or new test ♻, i386: Regression or new test ♻, ppc64el: Regression or new > test ♻, riscv64: Test in progress, s390x: Regression or new test ♻ The attached debdiff should fix the autopkgtest regression. -- Regards Sudip
diff -Nru janus-1.1.2/debian/changelog janus-1.1.2/debian/changelog --- janus-1.1.2/debian/changelog 2025-04-11 19:49:12.000000000 +0100 +++ janus-1.1.2/debian/changelog 2025-06-05 17:23:39.000000000 +0100 @@ -1,3 +1,12 @@ +janus (1.1.2-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * d/p/fix-test.patch: Start Janus only if Janus is not + already running. (Closes: #1102692) + * Remove skip-not-installable from autopkgtest. + + -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Thu, 05 Jun 2025 17:23:39 +0100 + janus (1.1.2-2) unstable; urgency=medium * Team upload. diff -Nru janus-1.1.2/debian/patches/fix-test.patch janus-1.1.2/debian/patches/fix-test.patch --- janus-1.1.2/debian/patches/fix-test.patch 1970-01-01 01:00:00.000000000 +0100 +++ janus-1.1.2/debian/patches/fix-test.patch 2025-06-05 17:23:39.000000000 +0100 @@ -0,0 +1,45 @@ +Description: Start Janus only if Janus not aleady running + +Author: Sudip Mukherjee <sudipm.mukher...@gmail.com> +Bug-Debian: https://bugs.debian.org/1102692 +Forwarded: https://github.com/meetecho/janus-gateway/pull/3551 +Last-Update: 2025-06-05 +--- + +--- janus-1.1.2.orig/test/test_aiortc.sh ++++ janus-1.1.2/test/test_aiortc.sh +@@ -7,9 +7,14 @@ PATH="$JANUS_SRC/src:$PATH" + TEST=${1-"$SCRIPTPATH/echo.py"} + URL=${2-"ws://localhost:8188/"} + +-echo "Starting Janus binary ..." +-janus >/dev/null 2>&1 & +-JANUS_PID=$! ++JANUS_RUNNING=$(ps ax | grep "bin\/janus" | grep -v grep | wc -l) ++if [ $JANUS_RUNNING -gt 0 ]; then ++ echo "Not starting Janus, already running ..." ++else ++ echo "Starting Janus binary ..." ++ janus >/dev/null 2>&1 & ++ JANUS_PID=$! ++fi + + echo "Waiting for some seconds before launching the test ..." + sleep 5 +@@ -19,10 +24,14 @@ python3 $TEST $URL + + if [ $? -eq 0 ]; then + echo "TEST SUCCEEDED" +- kill -9 $JANUS_PID 2>/dev/null ++ if [ $JANUS_RUNNING -eq 0 ]; then ++ kill -9 $JANUS_PID 2>/dev/null ++ fi + exit 0 + else + echo "TEST FAILED" +- kill -9 $JANUS_PID 2>/dev/null ++ if [ $JANUS_RUNNING -eq 0 ]; then ++ kill -9 $JANUS_PID 2>/dev/null ++ fi + exit 1 + fi diff -Nru janus-1.1.2/debian/patches/series janus-1.1.2/debian/patches/series --- janus-1.1.2/debian/patches/series 2025-04-11 19:45:07.000000000 +0100 +++ janus-1.1.2/debian/patches/series 2025-06-05 17:23:39.000000000 +0100 @@ -13,3 +13,4 @@ 2009_rollup_3.patch 2010_fix_ffmpeg_7.patch 2011_fix_test_python3.11.patch +fix-test.patch diff -Nru janus-1.1.2/debian/tests/control janus-1.1.2/debian/tests/control --- janus-1.1.2/debian/tests/control 2025-04-11 19:46:19.000000000 +0100 +++ janus-1.1.2/debian/tests/control 2025-06-05 17:23:39.000000000 +0100 @@ -1,8 +1,9 @@ Test-Command: test/test_aiortc.sh -Restrictions: allow-stderr, skip-not-installable +Restrictions: allow-stderr Depends: janus, python3-aiortc, python3-pytest-asyncio, python3-websockets, + procps
