Merge branch 'debian/sid' into debian/experimental

[apt.git] / test / integration / test-bug-604222-new-and-autoremove

diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove
index 5820fb0dc1809472c673a325e7bcbf1cddcd0a50..52992680b7f6c548a70a3523cc874d2adb15314d 100755 (executable)
--- a/test/integration/test-bug-604222-new-and-autoremove
+++ b/test/integration/test-bug-604222-new-and-autoremove
@@ -8,10 +8,10 @@ configarchitecture "i386"
 setupaptarchive
 
 touch rootdir/var/lib/apt/extended_states
 setupaptarchive
 
 touch rootdir/var/lib/apt/extended_states

-aptmark markauto 'libvtk5.4'
+testsuccess aptmark markauto 'libvtk5.4'

 testmarkedauto 'libvtk5.4'
 
 testmarkedauto 'libvtk5.4'
 

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

 Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
 Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:


@@ -23,7 +23,7 @@ The following NEW packages will be installed:
 Inst libavcodec52 (4:0.5.2-6 localhost [i386])
 Conf libavcodec52 (4:0.5.2-6 localhost [i386])" aptget install libavcodec52 -s
 
 Inst libavcodec52 (4:0.5.2-6 localhost [i386])
 Conf libavcodec52 (4:0.5.2-6 localhost [i386])" aptget install libavcodec52 -s
 

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

 Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
 Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:


@@ -51,7 +51,7 @@ Building dependency tree...
       MarkInstall libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=0
   MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0
   MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0
       MarkInstall libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=0
   MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0
   MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0

-  MarkDelete libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=1
+  MarkDelete libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=0

 The following extra packages will be installed:
   libavcodec52 libopenal-dev
 The following NEW packages will be installed:
 The following extra packages will be installed:
   libavcodec52 libopenal-dev
 The following NEW packages will be installed:


@@ -61,6 +61,6 @@ Need to get 0 B/6304 kB of archives.
 After this operation, 17.3 MB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.'
 
 After this operation, 17.3 MB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.'
 

-testequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=0
-testequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=1
-testequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=small
+testfailureequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=0
+testfailureequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=1
+testfailureequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=small