save and restore selection states before/after calling dpkg

[apt.git] / test / integration / test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings

diff --git a/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings b/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
index af6b7b5048fa7463b198bbbd08b6461811534158..4ac5e9060aef081165503412e0649c38f758a069 100755 (executable)
--- a/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
+++ b/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'amd64' 'i386'
 
@@ -20,9 +20,9 @@ insertpackage 'unstable' 'steam' 'i386' '2' 'Depends: libmesa'
 
 setupaptarchive
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libmesa:i386
 The following NEW packages will be installed:
   libmesa:i386 steam:i386
@@ -31,9 +31,9 @@ Inst libmesa:i386 (1 stable [i386])
 Inst steam:i386 (1 stable [i386])
 Conf libmesa:i386 (1 stable [i386])
 Conf steam:i386 (1 stable [i386])' aptget install steam -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libmesa:i386
 The following NEW packages will be installed:
   libmesa:i386 steam:i386
@@ -45,9 +45,9 @@ Conf steam:i386 (2 unstable [i386])' aptget install steam -st unstable
 
 cp rootdir/var/lib/dpkg/status default-status.dpkg
 insertinstalledpackage 'libmesa' 'amd64' '1' 'Multi-Arch: same'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libmesa:i386
 The following NEW packages will be installed:
   libmesa:i386 steam:i386
@@ -56,9 +56,9 @@ Inst libmesa:i386 (1 stable [i386])
 Inst steam:i386 (1 stable [i386])
 Conf libmesa:i386 (1 stable [i386])
 Conf steam:i386 (1 stable [i386])' aptget install steam -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libmesa libmesa:i386
 The following NEW packages will be installed:
   libmesa:i386 steam:i386
@@ -76,9 +76,9 @@ cp default-status.dpkg rootdir/var/lib/dpkg/status
 insertinstalledpackage 'libmesa-lts' 'amd64' '1' 'Provides: libmesa
 Conflicts: libmesa
 Multi-Arch: same'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libmesa-lts:i386
 The following NEW packages will be installed:
   libmesa-lts:i386 steam:i386
@@ -87,9 +87,9 @@ Inst libmesa-lts:i386 (1 stable [i386])
 Inst steam:i386 (1 stable [i386])
 Conf libmesa-lts:i386 (1 stable [i386])
 Conf steam:i386 (1 stable [i386])' aptget install steam -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libmesa-lts libmesa-lts:i386
 The following NEW packages will be installed:
   libmesa-lts:i386 steam:i386