From b6c8c5ce2b255eb03554435a620934d47a2a14d5 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 15 Dec 2020 13:20:16 +0100
Subject: test: fixup for hash table size increase (changed output order)

---
 test/integration/test-apt-cache                             |  4 ++--
 test/integration/test-bug-728500-tempdir                    |  4 ++--
 .../integration/test-external-installation-planner-protocol |  2 +-
 test/integration/test-resolver-provider-exchange            |  2 +-
 test/integration/test-ubuntu-bug-1876495-pkgnames-virtual   | 13 ++++++-------
 5 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
index bff1667e8..56c3268fb 100755
--- a/test/integration/test-apt-cache
+++ b/test/integration/test-apt-cache
@@ -46,9 +46,9 @@ testsuccess aptcache dump
 cp rootdir/tmp/testsuccess.output dump.output
 testsuccess test -s dump.output
 
-testsuccessequal 'bar
+testsuccessequal 'dpkg
+bar
 foo
-dpkg
 specific
 fancy' aptcache pkgnames
 testsuccessequal 'bar' aptcache pkgnames bar
diff --git a/test/integration/test-bug-728500-tempdir b/test/integration/test-bug-728500-tempdir
index 37661d168..8fab8f28f 100755
--- a/test/integration/test-bug-728500-tempdir
+++ b/test/integration/test-bug-728500-tempdir
@@ -18,6 +18,6 @@ export TMPDIR=/does-not-exists
 testsuccess aptget update -o Debug::Acquire::gpg=1
 unset TMPDIR
 
-testsuccessequal 'coolstuff
-dpkg' aptcache pkgnames
+testsuccessequal 'dpkg
+coolstuff' aptcache pkgnames
 testsuccess ls rootdir/var/lib/apt/lists/*InRelease
diff --git a/test/integration/test-external-installation-planner-protocol b/test/integration/test-external-installation-planner-protocol
index 1d9abc901..56a7ad1d6 100755
--- a/test/integration/test-external-installation-planner-protocol
+++ b/test/integration/test-external-installation-planner-protocol
@@ -40,7 +40,7 @@ testsuccessequal 'Request: EIPP 0.1
 Architecture: amd64
 Architectures: amd64
 Remove: bar:amd64
-Install: libfoo:amd64 foo:amd64
+Install: foo:amd64 libfoo:amd64
 Planner: internal' head -n 6 "$EIPPLOG"
 aptinternalplanner < "$EIPPLOG" > planner.log || true
 testsuccessequal 'Remove: 7
diff --git a/test/integration/test-resolver-provider-exchange b/test/integration/test-resolver-provider-exchange
index 3f5310fa6..0a85db34d 100755
--- a/test/integration/test-resolver-provider-exchange
+++ b/test/integration/test-resolver-provider-exchange
@@ -104,4 +104,4 @@ for i in $(seq 0 10); do
 	insertinstalledpackage "stuff$i" 'all' '1' 'Depends: fuse'
 done
 msgmsg 'fuse has many dependers installed'
-installfoobars ' [stuff10:amd64 stuff0:amd64 stuff1:amd64 stuff2:amd64 stuff3:amd64 stuff4:amd64 stuff5:amd64 stuff6:amd64 stuff7:amd64 stuff8:amd64 stuff9:amd64 ]'
+installfoobars ' [stuff0:amd64 stuff1:amd64 stuff2:amd64 stuff3:amd64 stuff4:amd64 stuff5:amd64 stuff6:amd64 stuff7:amd64 stuff8:amd64 stuff9:amd64 stuff10:amd64 ]'
diff --git a/test/integration/test-ubuntu-bug-1876495-pkgnames-virtual b/test/integration/test-ubuntu-bug-1876495-pkgnames-virtual
index 00a767479..2391c7e2d 100755
--- a/test/integration/test-ubuntu-bug-1876495-pkgnames-virtual
+++ b/test/integration/test-ubuntu-bug-1876495-pkgnames-virtual
@@ -1,4 +1,3 @@
-
 #!/bin/sh
 
 set -e
@@ -15,10 +14,10 @@ setupaptarchive
 changetowebserver
 
 testsuccess aptget update -o Debug::Acquire::gpg=1
-testsuccessequal "coolstuff
-dpkg" aptcache pkgnames
+testsuccessequal "dpkg
+coolstuff" aptcache pkgnames
 
-testsuccessequal "source-package
-coolstuff
-dpkg
-virtual-package" aptcache pkgnames --all-names
+testsuccessequal "dpkg
+source-package
+virtual-package
+coolstuff" aptcache pkgnames --all-names
-- 
cgit v1.2.3