randomize acquire order for same type index files

[apt.git] / test / integration / test-bug-712435-missing-descriptions

diff --git a/test/integration/test-bug-712435-missing-descriptions b/test/integration/test-bug-712435-missing-descriptions
index c61bea452ade207d3f8faa5f7cc135c547a6f644..c2319930533c2a130e04dc1bc1a1deee34f08b2f 100755 (executable)
--- a/test/integration/test-bug-712435-missing-descriptions
+++ b/test/integration/test-bug-712435-missing-descriptions
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'amd64'
 
 setupenvironment
 configarchitecture 'amd64'
 


@@ -81,59 +81,82 @@ Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" > aptarchive/Packages
 
 setupaptarchive
 
 
 setupaptarchive
 

-testequal "Package: apt-normal
+testsuccessequal "Package: apt-normal

 $PACKAGESTANZA
 $DESCRIPTION
 Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 " aptcache show apt-normal
 
 $PACKAGESTANZA
 $DESCRIPTION
 Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 " aptcache show apt-normal
 

-# displaying the translated Description would be equally valid,
-# but we assume only one description is in a Packages file and
-# so we prefer "Description" over "Description-*" currently.

 for variant in 'below' 'middle' 'top'; do
 for variant in 'below' 'middle' 'top'; do

-       testequal "Package: apt-both-$variant
+       testsuccessequal "Package: apt-both-$variant

 $PACKAGESTANZA
 $PACKAGESTANZA

-$DESCRIPTION
+$TRANSDESCRIPTION

 Description-md5: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
 " aptcache show apt-both-$variant
 done
 
 Description-md5: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
 " aptcache show apt-both-$variant
 done
 

-testequal "Package: apt-trans
+testsuccessequal "Package: apt-trans

 $PACKAGESTANZA
 $TRANSDESCRIPTION
 Description-md5: cccccccccccccccccccccccccccccccc
 " aptcache show apt-trans
 
 $PACKAGESTANZA
 $TRANSDESCRIPTION
 Description-md5: cccccccccccccccccccccccccccccccc
 " aptcache show apt-trans
 

-testequal "Package: apt-md5
+testsuccessequal "Package: apt-md5

 $PACKAGESTANZA
 Description-md5: dddddddddddddddddddddddddddddddd
 " aptcache show apt-md5
 
 $PACKAGESTANZA
 Description-md5: dddddddddddddddddddddddddddddddd
 " aptcache show apt-md5
 

-testequal "Package: apt-none
+testsuccessequal "Package: apt-none

 $PACKAGESTANZA
 " aptcache show apt-none
 
 $PACKAGESTANZA
 " aptcache show apt-none
 

-testequal "Package: apt-intermixed
+testsuccessequal "Package: apt-intermixed

 $PACKAGESTANZA
 $DESCRIPTION
 Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 X-Some-Flag: yes
 " aptcache show apt-intermixed
 
 $PACKAGESTANZA
 $DESCRIPTION
 Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 X-Some-Flag: yes
 " aptcache show apt-intermixed
 

-testequal "Package: apt-intermixed2
+testsuccessequal "Package: apt-intermixed2

 $PACKAGESTANZA
 $PACKAGESTANZA

-$DESCRIPTION
+$TRANSDESCRIPTION

 Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 X-Some-Flag: yes
 X-Foo-Flag: Something with a Description
 X-Bar-Flag: no
 " aptcache show apt-intermixed2
 
 Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 X-Some-Flag: yes
 X-Foo-Flag: Something with a Description
 X-Bar-Flag: no
 " aptcache show apt-intermixed2
 

-testequal "Package: apt-intermixed3
+testsuccessequal "Package: apt-intermixed3

 $PACKAGESTANZA
 $PACKAGESTANZA

-$DESCRIPTION
+$TRANSDESCRIPTION

 Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 X-Some-Flag: yes
 X-Foo-Flag: Something with a Description
 X-Bar-Flag: no
 " aptcache show apt-intermixed3
 Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 X-Some-Flag: yes
 X-Foo-Flag: Something with a Description
 X-Bar-Flag: no
 " aptcache show apt-intermixed3

+
+msgtest 'Test that no description does not destroy' 'showpkg'
+aptcache showpkg apt-none | sed 's#/tmp/.*_aptarchive_#/tmp/aptarchive_#' >showpkg.explosion && msgpass || msgfail
+testfileequal showpkg.explosion 'Package: apt-none
+Versions: 
+0.9.7.8 (/tmp/aptarchive_Packages)
+
+
+Reverse Depends: 
+Dependencies: 
+0.9.7.8 - 
+Provides: 
+0.9.7.8 - 
+Reverse Provides: '
+
+testempty aptcache search nonexistentstring
+
+# packages without a description can't be found
+testsuccessequal 'apt-normal - commandline package manager
+apt-both-below - commandline package manager
+apt-both-middle - commandline package manager
+apt-both-top - commandline package manager
+apt-trans - commandline package manager
+apt-intermixed - commandline package manager
+apt-intermixed2 - commandline package manager
+apt-intermixed3 - commandline package manager' aptcache search apt