Package: pagekite Version: 0.5.8a-2 Severity: minor Tags: patch The attached patch will fix some issues in both tests. I've confirmed that the tests work as expected with adt-run.
-- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (900, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-1-amd64 (SMP w/12 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages pagekite depends on: ii daemon 0.6.4-1 ii python-openssl 0.15.1-2 ii python-socksipychain 2.0.15-1 pn python:any <none> pagekite recommends no packages. pagekite suggests no packages. -- Configuration Files: /etc/pagekite.d/10_account.rc [Errno 13] Permission denied: u'/etc/pagekite.d/10_account.rc' -- no debconf information
>From 59990f061415b7ff3355bff020b8a75ce7295c51 Mon Sep 17 00:00:00 2001 From: James Valleroy <[email protected]> Date: Sat, 5 Mar 2016 13:52:38 -0500 Subject: [PATCH] Fix autopkgtests and enable test-tunnel. --- debian/tests/control | 4 ++-- debian/tests/test-client-running | 3 +++ debian/tests/test-tunnel | 15 ++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debian/tests/control b/debian/tests/control index 2f5c4b8..48daa67 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,4 +1,4 @@ -Depend: @ -Tests: test-client-running +Depends: @ +Tests: test-client-running, test-tunnel Restrictions: needs-root diff --git a/debian/tests/test-client-running b/debian/tests/test-client-running index 495908e..ffc3836 100755 --- a/debian/tests/test-client-running +++ b/debian/tests/test-client-running @@ -1,5 +1,7 @@ #!/bin/sh +set -e + PATH=/usr/sbin:$PATH export PATH @@ -12,6 +14,7 @@ if service pagekite status; then echo "success: service running" else echo "error: service is not running" + exit 1 fi service pagekite stop 2>&1 diff --git a/debian/tests/test-tunnel b/debian/tests/test-tunnel index 5dcc2c6..14eced0 100755 --- a/debian/tests/test-tunnel +++ b/debian/tests/test-tunnel @@ -1,14 +1,14 @@ #!/bin/sh # -# Set up pagekite on localhost to tunnel from port 80 (http) to port -# 113 (ident) to allow the ident server to be queried using port 80. +# Set up pagekite on localhost to tunnel from port 8080 to port 113 +# (ident) to allow the ident server to be queried using port 8080. set -e -set -x SECRET=foo # FIXME replace by something random DNSNAME=$(hostname) identport=113 +test_error=no echo "starting frontend" pagekite \ @@ -27,13 +27,18 @@ backpid=$! sleep 10 echo "trying to connect to ident server via pagekite" -if echo | nc localhost http; then +if echo | nc localhost 8080; then echo success else echo error + test_error=yes fi echo "stopping pagekite processes" kill $frontpid $backpid sleep 5 -kill -9 $frontpid $backpid +kill -9 $frontpid $backpid 2>/dev/null || true + +if [ "$test_error" = "yes" ]; then + exit 1 +fi -- 2.7.0
