Simplify autopkgtest now that test-local-pull seems to be stable

debian/changelog

@@ -4,6 +4,7 @@ ostree (2017.12-1) UNRELEASED; urgency=medium
     - Drop all current patches, applied upstream
     - Update symbols file
   * Add some post-release bug fix patches
+  * Simplify autopkgtest now that test-local-pull seems to be stable
 
  -- Simon McVittie <smcv@debian.org>  Tue, 03 Oct 2017 19:14:14 +0100
 

debian/tests/control

@@ -1,4 +1,4 @@
-Tests: gnome-desktop-testing, test-local-pull
+Tests: gnome-desktop-testing
 Depends: gnome-desktop-testing, ostree-tests
 
 Tests: build

debian/tests/gnome-desktop-testing

@@ -3,20 +3,4 @@
 set -e
 exec 2>&1
 
-e=0
-
-tests="$(gnome-desktop-testing-runner -l libostree | while read t; do
-	t="${t%% *}"
-
-	case "$t" in
-		(libostree/test-local-pull.sh.test)
-			# frequently times out, https://bugs.debian.org/842606
-			# https://github.com/ostreedev/ostree/issues/605
-			continue
-			;;
-	esac
-
-	echo "$t"
-done)"
-
-gnome-desktop-testing-runner $tests
+exec gnome-desktop-testing-runner libostree

debian/tests/test-local-pull

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-exec 2>&1
-
-N=3
-passed=0
-
-for i in `seq 1 $N`; do
-	if gnome-desktop-testing-runner libostree/test-local-pull.sh.test; then
-		passed=$(( $passed + 1))
-	fi
-done
-
-echo "test-local-pull: passed $passed/$N attempts"
-
-if [ "$passed" -ne "$N" ]; then
-	exit 1
-fi