Преглед изворни кода

Fix integration tests for the removal of the Package pin output

This should make them work again.
Julian Andres Klode пре 11 година
родитељ
комит
bb08e2046e

+ 4 - 7
test/integration/test-bug-543966-downgrade-below-1000-pin

@@ -33,20 +33,17 @@ Pin-Priority: $2" > rootdir/etc/apt/preferences
 
 
 
 
 testpinning() {
 testpinning() {
-	local PKGPIN=''
 	local PKGPINPRIO=''
 	local PKGPINPRIO=''
 	local REPPINPRIO=''
 	local REPPINPRIO=''
 	if [ "$1" != '*' ]; then
 	if [ "$1" != '*' ]; then
 		PKGPINPRIO=''
 		PKGPINPRIO=''
 		REPPINPRIO=' 500'
 		REPPINPRIO=' 500'
-		PKGPIN='Package pin: 5.0.0
-  '
 	fi
 	fi
 	writepin "$1" '99'
 	writepin "$1" '99'
 	testsuccessequal "base-files:
 	testsuccessequal "base-files:
   Installed: 5.0.0-1
   Installed: 5.0.0-1
   Candidate: 5.0.0-1
   Candidate: 5.0.0-1
-  ${PKGPIN}Version table:
+  Version table:
  *** 5.0.0-1 100
  *** 5.0.0-1 100
         100 $STATUS
         100 $STATUS
      5.0.0 ${PKGPINPRIO:-99}
      5.0.0 ${PKGPINPRIO:-99}
@@ -56,7 +53,7 @@ testpinning() {
 	testsuccessequal "base-files:
 	testsuccessequal "base-files:
   Installed: 5.0.0-1
   Installed: 5.0.0-1
   Candidate: 5.0.0-1
   Candidate: 5.0.0-1
-  ${PKGPIN}Version table:
+  Version table:
  *** 5.0.0-1 100
  *** 5.0.0-1 100
         100 $STATUS
         100 $STATUS
      5.0.0 ${PKGPINPRIO:-100}
      5.0.0 ${PKGPINPRIO:-100}
@@ -66,7 +63,7 @@ testpinning() {
 	testsuccessequal "base-files:
 	testsuccessequal "base-files:
   Installed: 5.0.0-1
   Installed: 5.0.0-1
   Candidate: 5.0.0-1
   Candidate: 5.0.0-1
-  ${PKGPIN}Version table:
+  Version table:
  *** 5.0.0-1 100
  *** 5.0.0-1 100
         100 $STATUS
         100 $STATUS
      5.0.0 ${PKGPINPRIO:-999}
      5.0.0 ${PKGPINPRIO:-999}
@@ -76,7 +73,7 @@ testpinning() {
 	testsuccessequal "base-files:
 	testsuccessequal "base-files:
   Installed: 5.0.0-1
   Installed: 5.0.0-1
   Candidate: 5.0.0
   Candidate: 5.0.0
-  ${PKGPIN}Version table:
+  Version table:
  *** 5.0.0-1 100
  *** 5.0.0-1 100
         100 $STATUS
         100 $STATUS
      5.0.0 ${PKGPINPRIO:-1000}
      5.0.0 ${PKGPINPRIO:-1000}

+ 1 - 5
test/integration/test-policy-pinning

@@ -89,10 +89,6 @@ testequalpolicycoolstuff() {
 	local AB="$3"
 	local AB="$3"
 	local AS="$4"
 	local AS="$4"
 	local PB="$5"
 	local PB="$5"
-	local PINVERSION="$6"
-	if [ -n "$PINVERSION" ]; then
-		PINVERSION="Package pin: $PINVERSION
-  "
 	fi
 	fi
 	local IS=""
 	local IS=""
 	local IB=""
 	local IB=""
@@ -118,7 +114,7 @@ testequalpolicycoolstuff() {
 	testsuccessequal "coolstuff:
 	testsuccessequal "coolstuff:
   Installed: $INSTALLED
   Installed: $INSTALLED
   Candidate: $CANDIDATE
   Candidate: $CANDIDATE
-  ${PINVERSION}Version table:${BPO2ARCHIVE}
+  Version table:${BPO2ARCHIVE}
  $IB 2.0~bpo1 $PB
  $IB 2.0~bpo1 $PB
 ${BPO1ARCHIVE}$SB
 ${BPO1ARCHIVE}$SB
  $IS 1.0 $AS
  $IS 1.0 $AS