rename the paywall testcase and reformat it a bit

diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
new file mode 100755 (executable)
index 0000000..25cccf0
--- /dev/null
+++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
@@ -0,0 +1,47 @@
+#!/bin/sh
+set -e
+
+ensure_n_canary_strings_in_dir() {
+    DIR=$1
+    CANARY_STRING=$2
+    EXPECTED_N=$3
+
+    msgtest "Testing for $EXPECTED_N canary strings '$CANARY_STRING' in in" "$DIR"
+
+    N=$(grep "$CANARY_STRING" $DIR/* 2>/dev/null |wc -l )
+    if [ "$N" = "$EXPECTED_N" ]; then
+        msgpass
+        return 0
+    else
+        msgfail "Expected $EXPECTED_N canaries, got $N"
+        return 1
+    fi
+}
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'native'
+
+insertpackage 'unstable' 'unrelated' 'all' '1.0' 'stable'
+
+setupaptarchive
+changetowebserver --simulate-paywall
+
+rm -rf rootdir/var/lib/apt/lists
+msgtest 'excpected failure of' 'apt-get update'
+aptget update -qq 2>/dev/null && msgfail || msgpass
+
+ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ 'ni ni ni' 0
+testequal 'partial' ls rootdir/var/lib/apt/lists/
+
+# again, this time with pre-existing files valid data
+for f in Release Release.gpg main_binary-amd64_Packages stable_main_source_Sources; do
+    echo "canary" > rootdir/var/lib/apt/lists/localhost:8080_dists_stable_${f}
+done
+
+# this will fail, the important part is that the canaries remain
+msgtest 'excpected failure of' 'apt-get update'
+aptget update -qq 2>/dev/null && msgfail || msgpass
+ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ 'canary' 4

diff --git a/test/integration/test-ubuntu-bug346386 b/test/integration/test-ubuntu-bug346386
deleted file mode 100755 (executable)
index 1fbfb5c..0000000
--- a/test/integration/test-ubuntu-bug346386
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-set -e
-
-ensure_n_canary_strings_in_dir() {
-    DIR=$1
-    CANARY_STRING=$2
-    EXPECTED_N=$3
-
-    msgtest "Testing for $EXPECTED_N canary strings '$CANARY_STRING' in in $DIR"
-    
-
-    N=$(grep "$CANARY_STRING" $DIR/* 2>/dev/null |wc -l )
-    if [ "$N" = "$EXPECTED_N" ]; then
-        msgpass
-        return 0
-    else
-        msgfail "Expected $EXPECTED_N canaries, got $N"
-        return 1
-    fi
-}
-
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
-
-setupenvironment
-configarchitecture 'amd64'
-
-buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
-
-setupaptarchive
-changetowebserver --simulate-paywall
-
-rm -rf rootdir/var/lib/apt/lists
-if aptget update -qq 2>/dev/null; then
-    msgfail "excpected apt-get update failure"
-fi
-ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ "ni ni ni" 0
-testequal 'partial' ls rootdir/var/lib/apt/lists/
-
-# again, this time with pre-existing files valid data
-for f in Release Release.gpg main_binary-amd64_Packages stable_main_source_Sources; do 
-    echo "canary" > rootdir/var/lib/apt/lists/localhost:8080_dists_stable_${f}
-done
-# this will fail, the important part is that the canaries remain
-aptget update -qq 2>/dev/null || true
-ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ "canary" 4
-