centralize unlink checks in acquire-item

[apt.git] / test / integration / test-specific-architecture-dependencies

diff --git a/test/integration/test-specific-architecture-dependencies b/test/integration/test-specific-architecture-dependencies
index 1c72d7b229d93fec7f678ff7dd0512d3b0695ff1..b5fcdd6ac13a6afad25f5a77f4fd5bfc1b1f4467 100755 (executable)
--- a/test/integration/test-specific-architecture-dependencies
+++ b/test/integration/test-specific-architecture-dependencies
@@ -35,7 +35,7 @@ setupaptarchive
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libc6:i386
 The following NEW packages will be installed:
   libc6:i386 pre-depender
@@ -47,7 +47,7 @@ Conf pre-depender (1 unstable [all])' aptget install pre-depender -s
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libc6:i386
 The following NEW packages will be installed:
   depender libc6:i386
@@ -59,7 +59,7 @@ Conf depender (1 unstable [all])' aptget install depender -s
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libc6:i386
 The following NEW packages will be installed:
   depender-x32:i386 libc6:i386
@@ -71,7 +71,7 @@ Conf depender-x32:i386 (1 unstable [i386])' aptget install depender-x32:i386 -s
 
 testequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libc6:i386
 The following NEW packages will be installed:
   depender-x32 libc6:i386
@@ -83,7 +83,7 @@ Conf depender-x32 (1 unstable [amd64])' aptget install depender-x32:amd64 -s
 
 testequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libc6
 The following NEW packages will be installed:
   depender-x64 libc6
@@ -95,7 +95,7 @@ Conf depender-x64 (1 unstable [amd64])' aptget install depender-x64:amd64 -s
 
 testequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libc6
 The following NEW packages will be installed:
   depender-x64:i386 libc6
@@ -267,7 +267,7 @@ configarchitecture 'amd64'
 
 testequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libc6
 The following NEW packages will be installed:
   depender-x64 libc6
@@ -279,7 +279,7 @@ Conf depender-x64 (1 unstable [amd64])' aptget install depender-x64 -s
 
 testequal 'Reading package lists...
 Building dependency tree...
-E: Unable to locate package depender-x64' aptget install depender-x64:i386 -s
+E: Unable to locate package depender-x64:i386' aptget install depender-x64:i386 -s
 
 testequal 'Reading package lists...
 Building dependency tree...
@@ -289,12 +289,14 @@ The following NEW packages will be installed:
 Inst foo-native-depender (1 unstable [amd64])
 Conf foo-native-depender (1 unstable [amd64])' aptget install foo-native-depender -s
 
-# libold:i386 is installed, but we don't see it as i386 isn't configured
 testequal 'Reading package lists...
 Building dependency tree...
+The following packages will be REMOVED:
+  libold:i386
 The following NEW packages will be installed:
   breaker-x32
-0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Remv libold:i386 [1]
 Inst breaker-x32 (1 unstable [amd64])
 Conf breaker-x32 (1 unstable [amd64])' aptget install breaker-x32:amd64 -s