summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/integration/test-bug-543966-downgrade-below-1000-pin11
-rwxr-xr-xtest/integration/test-policy-pinning6
2 files changed, 5 insertions, 12 deletions
diff --git a/test/integration/test-bug-543966-downgrade-below-1000-pin b/test/integration/test-bug-543966-downgrade-below-1000-pin
index ede9ad6aa..435b6876e 100755
--- a/test/integration/test-bug-543966-downgrade-below-1000-pin
+++ b/test/integration/test-bug-543966-downgrade-below-1000-pin
@@ -33,20 +33,17 @@ Pin-Priority: $2" > rootdir/etc/apt/preferences
testpinning() {
- local PKGPIN=''
local PKGPINPRIO=''
local REPPINPRIO=''
if [ "$1" != '*' ]; then
PKGPINPRIO=''
REPPINPRIO=' 500'
- PKGPIN='Package pin: 5.0.0
- '
fi
writepin "$1" '99'
testsuccessequal "base-files:
Installed: 5.0.0-1
Candidate: 5.0.0-1
- ${PKGPIN}Version table:
+ Version table:
*** 5.0.0-1 100
100 $STATUS
5.0.0 ${PKGPINPRIO:-99}
@@ -56,7 +53,7 @@ testpinning() {
testsuccessequal "base-files:
Installed: 5.0.0-1
Candidate: 5.0.0-1
- ${PKGPIN}Version table:
+ Version table:
*** 5.0.0-1 100
100 $STATUS
5.0.0 ${PKGPINPRIO:-100}
@@ -66,7 +63,7 @@ testpinning() {
testsuccessequal "base-files:
Installed: 5.0.0-1
Candidate: 5.0.0-1
- ${PKGPIN}Version table:
+ Version table:
*** 5.0.0-1 100
100 $STATUS
5.0.0 ${PKGPINPRIO:-999}
@@ -76,7 +73,7 @@ testpinning() {
testsuccessequal "base-files:
Installed: 5.0.0-1
Candidate: 5.0.0
- ${PKGPIN}Version table:
+ Version table:
*** 5.0.0-1 100
100 $STATUS
5.0.0 ${PKGPINPRIO:-1000}
diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning
index c4f478efc..1c8d92bcc 100755
--- a/test/integration/test-policy-pinning
+++ b/test/integration/test-policy-pinning
@@ -89,10 +89,6 @@ testequalpolicycoolstuff() {
local AB="$3"
local AS="$4"
local PB="$5"
- local PINVERSION="$6"
- if [ -n "$PINVERSION" ]; then
- PINVERSION="Package pin: $PINVERSION
- "
fi
local IS=""
local IB=""
@@ -118,7 +114,7 @@ testequalpolicycoolstuff() {
testsuccessequal "coolstuff:
Installed: $INSTALLED
Candidate: $CANDIDATE
- ${PINVERSION}Version table:${BPO2ARCHIVE}
+ Version table:${BPO2ARCHIVE}
$IB 2.0~bpo1 $PB
${BPO1ARCHIVE}$SB
$IS 1.0 $AS