correct cross & disappear progress detection

[apt.git] / test / integration / test-conflicts-real-multiarch-same

diff --git a/test/integration/test-conflicts-real-multiarch-same b/test/integration/test-conflicts-real-multiarch-same
index d9111677cd0df7fbe70d319f9c23bff0463a2f05..73f7b9a613dec2b93f3b156ed1abda2d8742c2f1 100755 (executable)
--- a/test/integration/test-conflicts-real-multiarch-same
+++ b/test/integration/test-conflicts-real-multiarch-same
@@ -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' 'i386'
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
 


@@ -16,7 +16,7 @@ Conflicts: real-provider
 Multi-Arch: same'
 setupaptarchive
 
 Multi-Arch: same'
 setupaptarchive
 

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

 Building dependency tree...
 Note, selecting 'virtual-provider' instead of 'virtual'
 Note, selecting 'virtual-provider:i386' instead of 'virtual:i386'
 Building dependency tree...
 Note, selecting 'virtual-provider' instead of 'virtual'
 Note, selecting 'virtual-provider:i386' instead of 'virtual:i386'


@@ -26,9 +26,9 @@ The following NEW packages will be installed:
 Inst virtual-provider (2 unstable [amd64])
 Inst virtual-provider:i386 (2 unstable [i386])
 Conf virtual-provider (2 unstable [amd64])
 Inst virtual-provider (2 unstable [amd64])
 Inst virtual-provider:i386 (2 unstable [i386])
 Conf virtual-provider (2 unstable [amd64])

-Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s -q=0
+Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s

 
 

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

 Building dependency tree...
 The following NEW packages will be installed:
   real real:i386
 Building dependency tree...
 The following NEW packages will be installed:
   real real:i386


@@ -36,10 +36,10 @@ The following NEW packages will be installed:
 Inst real (2 unstable [amd64])
 Inst real:i386 (2 unstable [i386])
 Conf real (2 unstable [amd64])
 Inst real (2 unstable [amd64])
 Inst real:i386 (2 unstable [i386])
 Conf real (2 unstable [amd64])

-Conf real:i386 (2 unstable [i386])' aptget install real:* -s -q=0
+Conf real:i386 (2 unstable [i386])' aptget install real:* -s

 
 # ensure that we are not confused by the provides
 
 # ensure that we are not confused by the provides

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

 Building dependency tree...
 The following NEW packages will be installed:
   real-provider real-provider:i386
 Building dependency tree...
 The following NEW packages will be installed:
   real-provider real-provider:i386


@@ -47,4 +47,4 @@ The following NEW packages will be installed:
 Inst real-provider (2 unstable [amd64])
 Inst real-provider:i386 (2 unstable [i386])
 Conf real-provider (2 unstable [amd64])
 Inst real-provider (2 unstable [amd64])
 Inst real-provider:i386 (2 unstable [i386])
 Conf real-provider (2 unstable [amd64])

-Conf real-provider:i386 (2 unstable [i386])' aptget install real-provider:* -s -q=0
+Conf real-provider:i386 (2 unstable [i386])' aptget install real-provider:* -s