fix testcase expecting incorrect remove log from dpkg

[apt.git] / test / integration / test-bug-683786-build-dep-on-virtual-packages

diff --git a/test/integration/test-bug-683786-build-dep-on-virtual-packages b/test/integration/test-bug-683786-build-dep-on-virtual-packages
index 879d6a3bce2b97f25bdefe6a2a1aa78207d9adb3..831e1f8313976972f72e2d501aa97415f029bb5a 100755 (executable)
--- a/test/integration/test-bug-683786-build-dep-on-virtual-packages
+++ b/test/integration/test-bug-683786-build-dep-on-virtual-packages
@@ -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 'amd64' 'armel'
 
 setupenvironment
 configarchitecture 'amd64' 'armel'
 


@@ -12,7 +12,6 @@ insertpackage 'unstable' 'po-debconf' 'all' '1'
 insertsource 'unstable' 'dash' 'any' '1' 'Build-Depends: po-debconf'
 insertpackage 'unstable' 'make-po-debconf-pure-virtual' 'armel' '1' 'Depends: po-debconf'
 
 insertsource 'unstable' 'dash' 'any' '1' 'Build-Depends: po-debconf'
 insertpackage 'unstable' 'make-po-debconf-pure-virtual' 'armel' '1' 'Depends: po-debconf'
 

-insertpackage 'unstable' 'po-debconf' 'amd64' '1'

 insertsource 'unstable' 'diffutils' 'any' '1' 'Build-Depends: texi2html'
 
 insertpackage 'unstable' 'libselinux1-dev' 'amd64' '1' 'Provides: libselinux-dev'
 insertsource 'unstable' 'diffutils' 'any' '1' 'Build-Depends: texi2html'
 
 insertpackage 'unstable' 'libselinux1-dev' 'amd64' '1' 'Provides: libselinux-dev'


@@ -23,7 +22,7 @@ insertsource 'unstable' 'sed2' 'any' '1' 'Build-Depends: libsehurd-dev'
 
 setupaptarchive
 
 
 setupaptarchive
 

-testequal 'Package: po-debconf:armel
+testsuccessequal 'Package: po-debconf:armel

 Versions: 
 
 Reverse Depends: 
 Versions: 
 
 Reverse Depends: 


@@ -31,49 +30,76 @@ Reverse Depends:
 Dependencies: 
 Provides: 
 Reverse Provides: ' aptcache showpkg po-debconf:armel
 Dependencies: 
 Provides: 
 Reverse Provides: ' aptcache showpkg po-debconf:armel

-testequal 'N: Unable to locate package texi2html' aptcache showpkg texi2html:armel -q=0
+testsuccessequal 'N: Unable to locate package texi2html:armel' aptcache showpkg texi2html:armel

 
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
+Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   po-debconf
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Building dependency tree...
 The following NEW packages will be installed:
   po-debconf
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.

-Inst po-debconf (1 unstable, unstable [all])
-Conf po-debconf (1 unstable, unstable [all])' aptget build-dep dash -s
+Inst po-debconf (1 unstable [all])
+Conf po-debconf (1 unstable [all])' aptget build-dep dash -s

 
 

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
+Reading package lists...

 Building dependency tree...
 Building dependency tree...

-E: Build-Depends dependency for dash cannot be satisfied because the package po-debconf cannot be found' aptget build-dep -aarmel dash -s
-
-testequal 'Reading package lists...
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ builddeps:dash:armel : Depends: po-debconf:armel but it is not installable
+E: Unable to correct problems, you have held broken packages.' aptget build-dep -aarmel dash -s
+testfailureequal 'Reading package lists...
+Reading package lists...

 Building dependency tree...
 Building dependency tree...

-E: Build-Depends dependency for diffutils cannot be satisfied because the package texi2html cannot be found' aptget build-dep -aarmel diffutils -s
-
-testequal "Reading package lists...
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ builddeps:diffutils:armel : Depends: texi2html:armel but it is not installable
+E: Unable to correct problems, you have held broken packages.' aptget build-dep -aarmel diffutils -s
+
+testsuccessequal "Reading package lists...
+Reading package lists...

 Building dependency tree...
 Building dependency tree...

-Note, selecting 'libselinux1-dev' instead of 'libselinux-dev'

 The following NEW packages will be installed:
   libselinux1-dev
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libselinux1-dev (1 unstable [amd64])
 Conf libselinux1-dev (1 unstable [amd64])" aptget build-dep sed -s
 
 The following NEW packages will be installed:
   libselinux1-dev
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libselinux1-dev (1 unstable [amd64])
 Conf libselinux1-dev (1 unstable [amd64])" aptget build-dep sed -s
 

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
+Reading package lists...

 Building dependency tree...
 Building dependency tree...

-E: Build-Depends dependency for sed cannot be satisfied because the package libselinux-dev cannot be found' aptget build-dep -aarmel sed -s
-
-testequal "Reading package lists...
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ builddeps:sed:armel : Depends: libselinux-dev:armel but it is not installable
+E: Unable to correct problems, you have held broken packages.' aptget build-dep -aarmel sed -s
+
+testsuccessequal "Reading package lists...
+Reading package lists...

 Building dependency tree...
 Building dependency tree...

-Note, selecting 'libsehurd1-dev' instead of 'libsehurd-dev'

 The following NEW packages will be installed:
   libsehurd1-dev
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsehurd1-dev (1 unstable [amd64])
 Conf libsehurd1-dev (1 unstable [amd64])" aptget build-dep sed2 -s
 
 The following NEW packages will be installed:
   libsehurd1-dev
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsehurd1-dev (1 unstable [amd64])
 Conf libsehurd1-dev (1 unstable [amd64])" aptget build-dep sed2 -s
 

-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
+Reading package lists...

 Building dependency tree...
 Building dependency tree...

-Note, selecting 'libsehurd1-dev:armel' instead of 'libsehurd-dev:armel'

 The following NEW packages will be installed:
   libsehurd1-dev:armel
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 The following NEW packages will be installed:
   libsehurd1-dev:armel
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.