test-apt-download-progress: Allow smaller progress change

[apt.git] / test / integration / test-pin-non-existent-package

diff --git a/test/integration/test-pin-non-existent-package b/test/integration/test-pin-non-existent-package
index c91e778442ca6c0ef5a19bee94f97d9f50c7474a..bcbe103d71dc61d95457a6ded5fcdb526c767508 100755 (executable)
--- a/test/integration/test-pin-non-existent-package
+++ b/test/integration/test-pin-non-existent-package
@@ -6,7 +6,7 @@ TESTDIR=$(readlink -f $(dirname $0))
 setupenvironment
 configarchitecture "i386"
 
 setupenvironment
 configarchitecture "i386"
 

-insertpackage 'unstable' 'apt' 'i386' '0.8.15'
+insertpackage 'unstable' 'rapt' 'i386' '0.8.15'

 insertpackage 'unstable' 'arch' 'i386' '1.0'
 
 setupaptarchive
 insertpackage 'unstable' 'arch' 'i386' '1.0'
 
 setupaptarchive


@@ -22,40 +22,43 @@ testcandidate() {
        fi
 }
 
        fi
 }
 

-testcandidate apt '0.8.15'
-testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
-testequal 'Reading package lists...
+testcandidate rapt '0.8.15'
+testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist
+testsuccessequal 'Reading package lists...

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

-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade
+Calculating upgrade...
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only

 
 

-echo 'Package: apt
+echo 'Package: rapt

 Pin: release a=unstable
 Pin-Priority: -1' > rootdir/etc/apt/preferences
 
 Pin: release a=unstable
 Pin-Priority: -1' > rootdir/etc/apt/preferences
 

-testcandidate apt '(none)'
-testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
-testequal 'Reading package lists...
+testcandidate rapt '(none)'
+testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist
+testsuccessequal 'Reading package lists...

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

-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade
+Calculating upgrade...
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only

 
 echo '
 Package: doesntexist
 Pin: release a=unstable
 Pin-Priority: 1000' >> rootdir/etc/apt/preferences
 
 
 echo '
 Package: doesntexist
 Pin: release a=unstable
 Pin-Priority: 1000' >> rootdir/etc/apt/preferences
 

-testcandidate apt '(none)'
+testcandidate rapt '(none)'

 
 echo '
 
 echo '

-Package: apt
+Package: rapt

 Pin: release a=unstable
 Pin-Priority: 1000' >> rootdir/etc/apt/preferences
 
 Pin: release a=unstable
 Pin-Priority: 1000' >> rootdir/etc/apt/preferences
 

-testcandidate apt '(none)'
-testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
+testcandidate rapt '(none)'
+testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist

 
 

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

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

-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade
+Calculating upgrade...
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only

 
 echo 'Package: arch:amd64
 Pin: release a=unstable
 
 echo 'Package: arch:amd64
 Pin: release a=unstable