From 846bc058cb0c1bf7ce7c2fb30b9c277e96e9eaf7 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 18 Oct 2014 22:46:48 +0200
Subject: check lists/ content in tests doing rollback

Git-Dch: Ignore
---
 test/integration/test-apt-update-transactions | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'test/integration/test-apt-update-transactions')

diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions
index 2fc5f1dad..fe352c762 100755
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -25,40 +25,39 @@ restorefile() {
 	mv "${1}.bak" "$1"
 }
 
-listscheck() {
-	testequal "$(cat $1)" ls rootdir/var/lib/apt/lists
-}
-
 testrun() {
 	# produce an unsigned repository
 	find aptarchive \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
 	testfailure aptget update --no-allow-insecure-repositories
-	listscheck "$1"
+	testfileequal "$1" "$(listcurrentlistsdirectory)"
 
 	# signed but broken
 	signreleasefiles
 
 	breakfile aptarchive/dists/unstable/main/binary-i386/Packages
 	testfailure aptget update
-	listscheck "$1"
+	testfileequal "$1" "$(listcurrentlistsdirectory)"
 	restorefile aptarchive/dists/unstable/main/binary-i386/Packages
 
 	breakfile aptarchive/dists/unstable/main/source/Sources
 	testfailure aptget update
-	listscheck "$1"
+	testfileequal "$1" "$(listcurrentlistsdirectory)"
 	restorefile aptarchive/dists/unstable/main/source/Sources
 }
 
 testsetup() {
 	msgmsg 'Test with no initial data over' "$1"
 	rm -rf rootdir/var/lib/apt/lists
-	mkdir -p rootdir/var/lib/apt/lists/partial
-	ls rootdir/var/lib/apt/lists > listsdir.lst
+	mkdir -m 700 -p rootdir/var/lib/apt/lists/partial
+	if [ "$(id -u)" = '0' ]; then
+		chown _apt:root rootdir/var/lib/apt/lists/partial
+	fi
+	listcurrentlistsdirectory > listsdir.lst
 	testrun 'listsdir.lst'
 
 	msgmsg 'Test with initial data over' "$1"
 	testsuccess aptget update
-	ls rootdir/var/lib/apt/lists > listsdir.lst
+	listcurrentlistsdirectory > listsdir.lst
 	testrun 'listsdir.lst'
 }
 
-- 
cgit v1.2.3