pass --force-remove-essential to dpkg only if needed

[apt.git] / test / integration / test-bug-753297-upgradable

diff --git a/test/integration/test-bug-753297-upgradable b/test/integration/test-bug-753297-upgradable
index 068704b3e73a1ad11ff74556c4ff8faf2b0415e4..f33a6591d487fa36702bdec906a0f31098e2b6b7 100755 (executable)
--- a/test/integration/test-bug-753297-upgradable
+++ b/test/integration/test-bug-753297-upgradable
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'i386'
 
 setupenvironment
 configarchitecture 'i386'
 


@@ -16,8 +16,7 @@ Pin: release unstable
 Pin-Priority: 1
 EOF
 
 Pin-Priority: 1
 EOF
 

-insertinstalledpackage 'foo' 'all' '1'
-insertpackage 'testing' 'foo' 'all' '1'
+insertpackage 'testing,installed' 'foo' 'all' '1'

 insertpackage 'testing-updates' 'foo' 'all' '2'
 insertpackage 'unstable' 'foo' 'all' '3'
 
 insertpackage 'testing-updates' 'foo' 'all' '2'
 insertpackage 'unstable' 'foo' 'all' '3'
 


@@ -26,9 +25,10 @@ insertpackage 'testing' 'bar' 'all' '2'
 
 setupaptarchive
 
 
 setupaptarchive
 

-testequal "Listing...
-bar/testing 2 all [upgradable from: 1]" apt list --upgradable
+testsuccessequal "Listing...
+bar/testing 2 all [upgradable from: 1]
+N: There is 1 additional version. Please use the '-a' switch to see it" apt list --upgradable

 
 

-testequal "Listing...
+testsuccessequal "Listing...

 bar/testing 2 all [upgradable from: 1]
 foo/testing,now 1 all [installed]" apt list
 bar/testing 2 all [upgradable from: 1]
 foo/testing,now 1 all [installed]" apt list