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

diff --git a/test/integration/framework b/test/integration/framework
index 0da9e2aab64d4ae1b01e41c49bd31eaf3f9fcace..d28085ee4c851b42aba62c095f6360bb0eaa0243 100644 (file)
--- 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 0389415c14e534da99108d1ec838b2189d356c1f..80c51152d5f2769b45a06883a50ca6f265b08c42 100755 (executable)
--- 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 fe352c76252c0bfc3040dd44ecd3394eb64f8fb0..bf425a22ecfa68b5d694ccd5c40036ae663593ff 100755 (executable)
--- 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 df2c69cf66a2c04368b066ec53eda55790e79498..ea516fc12b0ba4c01a68d2e55d1efafab0e56b07 100755 (executable)
--- 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