if critical or-group can't be satisfied, exit directly.

[apt.git] / test / integration / test-disappearing-packages

diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages
index ebf2bb14f4f2e1cbebff6dd66a69445ca3d84165..b5d565c2f13eb3ee839219633eedc3c0032346f3 100755 (executable)
--- a/test/integration/test-disappearing-packages
+++ b/test/integration/test-disappearing-packages
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-local TESTDIR=$(readlink -f $(dirname $0))
+TESTDIR=$(readlink -f $(dirname $0))

 . $TESTDIR/framework
 setupenvironment
 configarchitecture "i386"
 . $TESTDIR/framework
 setupenvironment
 configarchitecture "i386"


@@ -31,7 +31,7 @@ setupaptarchive
 
 aptget install old-pkg=1.0 --trivial-only -qq 2>&1 > /dev/null
 
 
 aptget install old-pkg=1.0 --trivial-only -qq 2>&1 > /dev/null
 

-testfileequal "rootdir/var/lib/apt/extended_states" "" # old-pkg is manual installed
+testmarkedauto # old-pkg is manual installed

 
 local CMD="aptget dist-upgrade -y -q=0"
 msgtest "Test for equality of" "$CMD"
 
 local CMD="aptget dist-upgrade -y -q=0"
 msgtest "Test for equality of" "$CMD"


@@ -51,4 +51,4 @@ Install: new-pkg:i386 (2.0, automatic)
 Upgrade: old-pkg:i386 (1.0, 2.0)
 Disappeared: old-pkg (1.0)"
 
 Upgrade: old-pkg:i386 (1.0, 2.0)
 Disappeared: old-pkg (1.0)"
 

-testfileequal "rootdir/var/lib/apt/extended_states" "" # new-pkg should have get the manual flag from old-pkg
+testmarkedauto  # new-pkg should have get the manual flag from old-pkg