randomize acquire order for same type index files

[apt.git] / test / integration / test-bug-735967-lib32-to-i386-unavailable

diff --git a/test/integration/test-bug-735967-lib32-to-i386-unavailable b/test/integration/test-bug-735967-lib32-to-i386-unavailable
index e9f3bf96dde0dabd743d7e88aeeb8fea5cc8cbbd..3b705d5f9a4048d58fde0347e56b0c2d8c6be009 100755 (executable)
--- a/test/integration/test-bug-735967-lib32-to-i386-unavailable
+++ b/test/integration/test-bug-735967-lib32-to-i386-unavailable
@@ -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' 'amd64'
 
 setupenvironment
 configarchitecture 'i386' 'amd64'


@@ -31,8 +31,9 @@ setupaptarchive --no-update
 configarchitecture 'amd64'
 testsuccess aptget update
 
 configarchitecture 'amd64'
 testsuccess aptget update
 

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

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

+Calculating upgrade...

 The following packages will be REMOVED:
   lib32nss-mdns
 The following packages will be upgraded:
 The following packages will be REMOVED:
   lib32nss-mdns
 The following packages will be upgraded:


@@ -42,7 +43,7 @@ Remv lib32nss-mdns [0.9-1]
 Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64])
 Conf libnss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s
 
 Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64])
 Conf libnss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s
 

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

 Building dependency tree...
 Some packages could not be installed. This may mean that you have
 requested an impossible situation or if you are using the unstable
 Building dependency tree...
 Some packages could not be installed. This may mean that you have
 requested an impossible situation or if you are using the unstable


@@ -58,8 +59,9 @@ E: Unable to correct problems, you have held broken packages.' aptget install fo
 configarchitecture 'amd64' 'i386'
 testsuccess aptget update
 
 configarchitecture 'amd64' 'i386'
 testsuccess aptget update
 

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

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

+Calculating upgrade...

 The following NEW packages will be installed:
   libnss-mdns:i386 libnss-mdns-i386:i386
 The following packages will be upgraded:
 The following NEW packages will be installed:
   libnss-mdns:i386 libnss-mdns-i386:i386
 The following packages will be upgraded:


@@ -69,14 +71,14 @@ Inst lib32nss-mdns [0.9-1] (0.10-6 unstable [amd64]) []
 Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64]) []
 Inst libnss-mdns:i386 (0.10-6 unstable [i386]) []
 Inst libnss-mdns-i386:i386 (0.10-6 unstable [i386])
 Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64]) []
 Inst libnss-mdns:i386 (0.10-6 unstable [i386]) []
 Inst libnss-mdns-i386:i386 (0.10-6 unstable [i386])

-Conf libnss-mdns:i386 (0.10-6 unstable [i386])
+Conf lib32nss-mdns (0.10-6 unstable [amd64])

 Conf libnss-mdns (0.10-6 unstable [amd64])
 Conf libnss-mdns (0.10-6 unstable [amd64])

-Conf libnss-mdns-i386:i386 (0.10-6 unstable [i386])
-Conf lib32nss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s
+Conf libnss-mdns:i386 (0.10-6 unstable [i386])
+Conf libnss-mdns-i386:i386 (0.10-6 unstable [i386])' aptget dist-upgrade -s

 
 

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

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

-The following extra packages will be installed:
+The following additional packages will be installed:

   libfoo libfoo-bin:i386
 The following NEW packages will be installed:
   foo libfoo libfoo-bin:i386
   libfoo libfoo-bin:i386
 The following NEW packages will be installed:
   foo libfoo libfoo-bin:i386