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

[apt.git] / test / integration / test-very-tight-loop-configure-with-unpacking-new-packages

diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
index 5856cd74447ce264b15a7e29ba3b7708971db1b5..09953e94306ceffaec6b7c6abde553032f0db8be 100755 (executable)
--- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
+++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
@@ -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'
 
 setupenvironment
 configarchitecture 'amd64'
 


@@ -28,6 +28,7 @@ setupaptarchive
 
 testequalor2 'Reading package lists...
 Building dependency tree...
 
 testequalor2 'Reading package lists...
 Building dependency tree...

+Calculating upgrade...

 The following NEW packages will be installed:
   ure
 The following packages will be upgraded:
 The following NEW packages will be installed:
   ure
 The following packages will be upgraded:


@@ -38,12 +39,13 @@ Inst libreoffice-style-galaxy [3] (4 sid [amd64]) [libreoffice-common:amd64 on l
 Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ]
 Inst libreoffice-common [3] (4 sid [all]) []
 Inst ure (4 sid [amd64])
 Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ]
 Inst libreoffice-common [3] (4 sid [all]) []
 Inst ure (4 sid [amd64])

-Conf ure (4 sid [amd64])
+Conf libreoffice (4 sid [amd64])

 Conf libreoffice-style-galaxy (4 sid [amd64])
 Conf libreoffice-style-galaxy (4 sid [amd64])

-Conf libreoffice-common (4 sid [all])

 Conf libreoffice-core (4 sid [amd64])
 Conf libreoffice-core (4 sid [amd64])

-Conf libreoffice (4 sid [amd64])' 'Reading package lists...
+Conf libreoffice-common (4 sid [all])
+Conf ure (4 sid [amd64])' 'Reading package lists...

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

+Calculating upgrade...

 The following NEW packages will be installed:
   ure
 The following packages will be upgraded:
 The following NEW packages will be installed:
   ure
 The following packages will be upgraded:


@@ -54,8 +56,8 @@ Inst libreoffice-style-galaxy [3] (4 sid [amd64]) [libreoffice-common:amd64 on l
 Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 ]
 Inst libreoffice-common [3] (4 sid [all]) []
 Inst ure (4 sid [amd64])
 Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 ]
 Inst libreoffice-common [3] (4 sid [all]) []
 Inst ure (4 sid [amd64])

-Conf ure (4 sid [amd64])
+Conf libreoffice (4 sid [amd64])

 Conf libreoffice-style-galaxy (4 sid [amd64])
 Conf libreoffice-style-galaxy (4 sid [amd64])

-Conf libreoffice-common (4 sid [all])

 Conf libreoffice-core (4 sid [amd64])
 Conf libreoffice-core (4 sid [amd64])

-Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s
+Conf libreoffice-common (4 sid [all])
+Conf ure (4 sid [amd64])' aptget dist-upgrade -s