summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-11-09 21:26:20 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-11-09 21:45:55 +0100
commit546dbfc82ad9ff0308b365bca3731a1118b1d251 (patch)
tree75ef25ce0789bfb68ab737dfa611461e54234c88
parent7e04a6bf23d857db60afd2ec3d0f4a8271b1c597 (diff)
disable the lock disabling in the tests
We create our own directories here and work without root in them, so we can also test the locking with them as it is how we usually operate. Git-Dch: Ignore
-rw-r--r--test/integration/framework3
-rwxr-xr-xtest/integration/test-apt-get-update-unauth-warning5
-rwxr-xr-xtest/integration/test-apt-update-transactions1
-rwxr-xr-xtest/integration/test-ubuntu-bug-346386-apt-get-update-paywall3
4 files changed, 7 insertions, 5 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 0da9e2aab..d28085ee4 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -236,7 +236,6 @@ setupenvironment() {
echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
- echo "Debug::NoLocking \"true\";" >> aptconfig.conf
echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
echo "Dir::Bin::Methods \"${METHODSDIR}\";" >> aptconfig.conf
# store apt-key were we can access it, even if we run it as a different user
@@ -1412,7 +1411,7 @@ aptautotest() {
aptautotest_aptget_update() {
if ! test -d "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists"; then return; fi
# all copied files are properly chmodded
- for file in $(find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" -maxdepth 1 -type f); do
+ for file in $(find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" -maxdepth 1 -type f ! -name 'lock'); do
testfilestats "$file" '%U:%G:%a' '=' "${USER}:${USER}:644"
done
}
diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index 0389415c1..80c51152d 100755
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/test/integration/test-apt-get-update-unauth-warning
@@ -27,8 +27,9 @@ W: The repository 'file: unstable Release' does not have a Release file. This is
E: Use --allow-insecure-repositories to force the update" aptget update --no-allow-insecure-repositories
# no package foo
-testequal "Listing..." apt list foo
-testequal "partial" ls rootdir/var/lib/apt/lists
+testequal 'Listing...' apt list foo
+testequal 'lock
+partial' ls rootdir/var/lib/apt/lists
# allow override
testequal "Ign file: unstable InRelease
diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions
index fe352c762..bf425a22e 100755
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -49,6 +49,7 @@ testsetup() {
msgmsg 'Test with no initial data over' "$1"
rm -rf rootdir/var/lib/apt/lists
mkdir -m 700 -p rootdir/var/lib/apt/lists/partial
+ touch rootdir/var/lib/apt/lists/lock
if [ "$(id -u)" = '0' ]; then
chown _apt:root rootdir/var/lib/apt/lists/partial
fi
diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
index df2c69cf6..ea516fc12 100755
--- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
+++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
@@ -40,7 +40,8 @@ msgtest 'Got expected failure message' 'apt-get update'
aptget update -qq 2>&1 | grep -q 'W:.*Does not start with a cleartext signature' && msgpass || msgfail
ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
-testequal 'partial' ls $LISTS
+testequal 'lock
+partial' ls $LISTS
# and again with pre-existing files with "valid data" which should remain
for f in Release Release.gpg main_binary-amd64_Packages main_source_Sources; do