summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-02-03 22:48:37 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-02-03 22:48:37 +0100
commit5cf733e18af40fbed978ec84e60ccd0ffc1871d8 (patch)
tree0caf83a90fafa7047f829e8fcfa17eed443ad608 /test
parent3eb9e257855d83d0486d7a5fa7cc5e2edebb6aaa (diff)
remove duplicated config-option setting and rename testdpkgnotinstalled
Diffstat (limited to 'test')
-rw-r--r--test/integration/framework7
-rwxr-xr-xtest/integration/test-autoremove4
2 files changed, 5 insertions, 6 deletions
diff --git a/test/integration/framework b/test/integration/framework
index fe1db14bc..e79d312ca 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -137,7 +137,6 @@ setupenvironment() {
echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
echo "Dir::Bin::Methods \"${BUILDDIRECTORY}/methods\";" >> aptconfig.conf
echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf
- echo "Dir::Bin::methods \"${BUILDDIRECTORY}/methods\";" >> aptconfig.conf
echo "DPKG::options:: \"dpkg\";" >> aptconfig.conf
echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
@@ -634,9 +633,9 @@ testdpkginstalled() {
msgpass
}
-testdpkgnoninstalled() {
- msgtest "Test for correctly non-installed package(s) with" "dpkg -l $*"
- local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^u]' | wc -l)"
+testdpkgnotinstalled() {
+ msgtest "Test for correctly not-installed package(s) with" "dpkg -l $*"
+ local PKGS="$(dpkg -l $* 2> /dev/null | grep '^[a-z]' | grep '^[^u]' | wc -l)"
if [ "$PKGS" != 0 ]; then
echo
dpkg -l $* | grep '^[a-z]'
diff --git a/test/integration/test-autoremove b/test/integration/test-autoremove
index 1ca325b29..f1ce4e9e7 100755
--- a/test/integration/test-autoremove
+++ b/test/integration/test-autoremove
@@ -19,7 +19,7 @@ Architecture: i386
Auto-Installed: 1
'
aptget remove debhelper -y -qq 2>&1 > /dev/null
-testdpkgnoninstalled 'debhelper'
+testdpkgnotinstalled 'debhelper'
testdpkginstalled 'po-debconf unrelated'
echo 'APT::NeverAutoRemove { "^debc.*nf$"; };' > rootdir/etc/apt/apt.conf.d/00autoremove
@@ -42,7 +42,7 @@ testdpkginstalled "po-debconf"
rm rootdir/etc/apt/apt.conf.d/00autoremove
aptget autoremove -y -qq 2>&1 > /dev/null
-testdpkgnoninstalled 'po-debconf'
+testdpkgnotinstalled 'po-debconf'
testfileequal 'rootdir/var/lib/apt/extended_states' ''