Fix integration tests for the removal of the Package pin output
authorJulian Andres Klode <jak@debian.org>
Thu, 13 Aug 2015 08:31:50 +0000 (10:31 +0200)
committerJulian Andres Klode <jak@debian.org>
Thu, 13 Aug 2015 08:31:50 +0000 (10:31 +0200)
This should make them work again.

test/integration/test-bug-543966-downgrade-below-1000-pin
test/integration/test-policy-pinning

index ede9ad6aa6bfce0f0b7eecf64c51005b72b4beca..435b6876e0bd990000e704db92cb1961fa997f77 100755 (executable)
@@ -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}
index c4f478efceaa84753101457922cfeaa34a55605d..1c8d92bccf0126af5446ac4148b6673a896d9198 100755 (executable)
@@ -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