test: Use :$(id -gn) instead of :root (when run as root)

[apt.git] / test / integration / test-ubuntu-bug-806274-install-suggests

diff --git a/test/integration/test-ubuntu-bug-806274-install-suggests b/test/integration/test-ubuntu-bug-806274-install-suggests
index fb72f09999f726582c9fe442948785a3f15129e4..b73a6f7541b0e79593855ffbd46b3a950c82314b 100755 (executable)
--- a/test/integration/test-ubuntu-bug-806274-install-suggests
+++ b/test/integration/test-ubuntu-bug-806274-install-suggests
@@ -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"
 
 setupenvironment
 configarchitecture "i386"
 


@@ -15,9 +15,9 @@ insertpackage 'unstable' 'baz' 'i386' '1.0'
 
 setupaptarchive
 
 
 setupaptarchive
 

-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:

   bar foo
 Suggested packages:
   baz
   bar foo
 Suggested packages:
   baz


@@ -32,9 +32,9 @@ Inst bar (1.0 unstable [i386])
 Conf bar (1.0 unstable [i386])' aptget install apt -s --install-recommends --no-install-suggests
 
 
 Conf bar (1.0 unstable [i386])' aptget install apt -s --install-recommends --no-install-suggests
 
 

-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:

   bar baz foo
 The following NEW packages will be installed:
   apt bar baz foo
   bar baz foo
 The following NEW packages will be installed:
   apt bar baz foo


@@ -48,9 +48,9 @@ Inst baz (1.0 unstable [i386])
 Conf bar (1.0 unstable [i386])
 Conf baz (1.0 unstable [i386])' aptget install apt -s --install-recommends --install-suggests
 
 Conf bar (1.0 unstable [i386])
 Conf baz (1.0 unstable [i386])' aptget install apt -s --install-recommends --install-suggests
 

-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:

   foo
 Suggested packages:
   baz
   foo
 Suggested packages:
   baz


@@ -64,9 +64,9 @@ Conf foo (1.0 unstable [i386])
 Inst apt (0.8.15 unstable [i386])
 Conf apt (0.8.15 unstable [i386])' aptget install apt -s --no-install-recommends --no-install-suggests
 
 Inst apt (0.8.15 unstable [i386])
 Conf apt (0.8.15 unstable [i386])' aptget install apt -s --no-install-recommends --no-install-suggests
 

-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:

   baz foo
 Recommended packages:
   bar
   baz foo
 Recommended packages:
   bar