X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0b7d641cf12761c3dcc5edb4031adfc9709963e4..2a64259c7305f55f0014f399b9bd0e62b469c32b:/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 d0a73af7d..3d3b0ada3 100755
--- a/test/integration/test-bug-407511-fail-invalid-default-release
+++ b/test/integration/test-bug-407511-fail-invalid-default-release
@@ -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