sync TFRewrite*Order arrays with dpkg and dak

[apt.git] / test / integration / test-bug-590041-prefer-non-virtual-packages

diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages
index aa9e487e1c393e6e36d397bc382897a805076724..3bd7d436ecbc95927dee47fcb51302d4c847c7d0 100755 (executable)
--- a/test/integration/test-bug-590041-prefer-non-virtual-packages
+++ b/test/integration/test-bug-590041-prefer-non-virtual-packages
@@ -3,12 +3,13 @@ set -e
 
 . $(readlink -f $(dirname $0))/framework
 setupenvironment
 
 . $(readlink -f $(dirname $0))/framework
 setupenvironment

-configarchitecture "i386" "armel"
+configarchitecture 'i386' 'armel'

 
 pkglibc6="Package: libc6
 Architecture: armel
 Version: 2.11.2-2~0.3
 Description: Embedded GNU C Library: Shared libraries
 
 pkglibc6="Package: libc6
 Architecture: armel
 Version: 2.11.2-2~0.3
 Description: Embedded GNU C Library: Shared libraries

+Description-md5: b8c1e0561b75e2dc6b6482a99079c3e4

 Filename: pool/main/e/eglibc/libc6_2.11.2-2_armel.deb
 Installed-Size: 9740
 MD5sum: f5b878ce5fb8aa01a7927fa1460df537
 Filename: pool/main/e/eglibc/libc6_2.11.2-2_armel.deb
 Installed-Size: 9740
 MD5sum: f5b878ce5fb8aa01a7927fa1460df537


@@ -25,6 +26,7 @@ Architecture: i386
 Version: 2.1.3-13~0.3
 Replaces: libc6 (<< 2.2.5-13~0.3)
 Description: The Berkeley database routines [glibc 2.0/2.1 compatibility]
 Version: 2.1.3-13~0.3
 Replaces: libc6 (<< 2.2.5-13~0.3)
 Description: The Berkeley database routines [glibc 2.0/2.1 compatibility]

+Description-md5: de1876f7fe7f7709a110875e145e38a8

 Filename: pool/main/d/db1-compat/libdb1-compat_2.1.3-13_armel.deb
 Installed-Size: 136
 MD5sum: 4043f176ab2b40b0c01bc1211b8c103c
 Filename: pool/main/d/db1-compat/libdb1-compat_2.1.3-13_armel.deb
 Installed-Size: 136
 MD5sum: 4043f176ab2b40b0c01bc1211b8c103c


@@ -41,11 +43,11 @@ $pkglibc6
 $pkglibdb1
 EOF
 
 $pkglibdb1
 EOF
 

-setupflataptarchive
+setupaptarchive

 
 testshowvirtual libc6:i386
 
 testshowvirtual libc6:i386

-testequal "$pkglibc6" aptcache show libc6:armel
-testequal "$pkglibc6" aptcache show libc6
-testequal "$pkglibdb1" aptcache show libdb1:i386
+testsuccessequal "$pkglibc6" aptcache show libc6:armel
+testsuccessequal "$pkglibc6" aptcache show libc6
+testsuccessequal "$pkglibdb1" aptcache show libdb1:i386

 testnopackage libdb1:armel
 testnopackage libdb1:armel

-testequal "$pkglibdb1" aptcache show libdb1
+testsuccessequal "$pkglibdb1" aptcache show libdb1