centralize unlink checks in acquire-item

[apt.git] / test / integration / test-ubuntu-bug-1304403-obsolete-priority-standard

diff --git a/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
index 2f2d384e1d3b58915551e44f1fd13360929c7e07..b4f705d8b33fba3d4695af9ab0311d40126c851e 100755 (executable)
--- a/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
+++ b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
@@ -25,8 +25,9 @@ insertinstalledpackage 'not-downloadable' 'all' '1.0' '' 'standard'
 setupaptarchive
 
 # discourage keeping obsolete high-priority packages …
 setupaptarchive
 
 # discourage keeping obsolete high-priority packages …

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

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

+Calculating upgrade...

 The following packages will be REMOVED:
   not-downloadable
 The following packages will be upgraded:
 The following packages will be REMOVED:
   not-downloadable
 The following packages will be upgraded:


@@ -41,8 +42,9 @@ for i in $(seq 1 10); do
 insertinstalledpackage "depender$i" 'all' '1.0' 'Depends: not-downloadable'
 done
 
 insertinstalledpackage "depender$i" 'all' '1.0' 'Depends: not-downloadable'
 done
 

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

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

+Calculating upgrade...

 The following packages have been kept back:
   upgradable
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.' aptget -s dist-upgrade
 The following packages have been kept back:
   upgradable
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.' aptget -s dist-upgrade