report warnings&errors consistently in edit-sources

[apt.git] / test / integration / test-bug-407511-fail-invalid-default-release

diff --git a/test/integration/test-bug-407511-fail-invalid-default-release b/test/integration/test-bug-407511-fail-invalid-default-release
index d0a73af7db284f3a67995e642af51cb96cbe0689..0e1b5ef833d95b6e578e43589b11c34614011acf 100755 (executable)
--- a/test/integration/test-bug-407511-fail-invalid-default-release
+++ b/test/integration/test-bug-407511-fail-invalid-default-release
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'i386'
 
@@ -23,18 +23,31 @@ getreleaseversionfromsuite() {
        fi
 }
 
+getlabelfromsuite() {
+       if [ "$SUITE" = 'unstable' ]; then
+               echo -n 'UnstableTestcases'
+       else
+               echo -n 'Testcases'
+       fi
+}
+
 setupaptarchive
 
 passdist() {
-       msgtest "Test that target-release is accepted" $1
-       aptget dist-upgrade -t $1 -qq && msgpass || msgfail
+       msgtest 'Test that target-release is accepted' $1
+       testsuccess --nomsg aptget dist-upgrade -t $1
+       msgtest 'Test that target-release pins with' $1
+       aptcache policy -t $1 | grep -q ' 990' && msgpass || msgfail
 }
 
 faildist() {
-       msgtest "Test that target-release is refused" $1
-       aptget dist-upgrade -t $1 -qq 2> /dev/null && msgfail || msgpass
+       msgtest 'Test that target-release is refused' $1
+       testfailure --nomsg aptget dist-upgrade -t $1
 }
 
+msgtest 'Test that no default-release is active in this test' 'setup'
+aptcache policy | grep -q ' 990' && msgfall || msgpass
+
 passdist unstable
 passdist sid
 faildist sidd
@@ -45,3 +58,9 @@ passdist 42*
 passdist 4*.0
 faildist 21.0
 faildist 21*
+# we accept, but don't validate the following
+passdist a=unstable
+passdist n=sid
+passdist v=42.0
+passdist c=main
+passdist l=UnstableTestcases