diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2024-01-10 10:48:51 +0000 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2024-01-10 11:06:23 +0000 |
| commit | d5cdd79bfb1b0dd1cadd878dad8273cbf7069dbb (patch) | |
| tree | ec9cd0225dbb5ba78f51c4a378c381815bce0b64 | |
| parent | 559ad32ed4d88e3216c3e12197bb54a9364f733f (diff) | |
Accept file system disorder in test-ignored-files
Reading the contents of a directory is not deterministic, so if we
wanted a fixed order we would need to sort the reported errors, but
as we don't need any specific order lets just accept both possibilities.
Regression-of: 7b41275b9da31d6c87bbaa0c9115e224e47b15e1
| -rwxr-xr-x | test/integration/test-ignored-files | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/test/integration/test-ignored-files b/test/integration/test-ignored-files index 90defdcd4..bc9eefb4d 100755 --- a/test/integration/test-ignored-files +++ b/test/integration/test-ignored-files @@ -6,34 +6,33 @@ TESTDIR="$(readlink -f "$(dirname "$0")")" setupenvironment configarchitecture 'amd64' +setupaptarchive -setupaptarchive --no-update - -testsuccessequal "Reading package lists... -Building dependency tree... -All packages are up to date." apt update -q - - -msgtest "Check notices about .list and .sources directories in sources.list.d" +msgmsg "Check notices about .list and .sources directories in sources.list.d" mkdir rootdir/etc/apt/sources.list.d/a-dir-that-will-be-ignored mkdir rootdir/etc/apt/sources.list.d/a-dir-that-will-be-ignored.conf mkdir rootdir/etc/apt/sources.list.d/a-dir-that-will-not-be-ignored.list mkdir rootdir/etc/apt/sources.list.d/a-dir-that-will-not-be-ignored.sources -testsuccessequal "Reading package lists... +testsuccesswithnotice apt update +testequalor2 "Reading package lists... +Building dependency tree... +All packages are up to date. +N: Ignoring 'a-dir-that-will-not-be-ignored.sources' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/sources.list.d/' as it is not a regular file +N: Ignoring 'a-dir-that-will-not-be-ignored.list' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/sources.list.d/' as it is not a regular file" "Reading package lists... Building dependency tree... All packages are up to date. N: Ignoring 'a-dir-that-will-not-be-ignored.list' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/sources.list.d/' as it is not a regular file -N: Ignoring 'a-dir-that-will-not-be-ignored.sources' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/sources.list.d/' as it is not a regular file" apt update +N: Ignoring 'a-dir-that-will-not-be-ignored.sources' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/sources.list.d/' as it is not a regular file" cat rootdir/tmp/testsuccesswithnotice.output rmdir rootdir/etc/apt/sources.list.d/a-dir-* -msgtest "Check for notices about .conf directories in apt.conf.d" +msgmsg "Check for notices about .conf directories in apt.conf.d" mkdir -p rootdir/etc/apt/apt.conf.d/a-dir-that-will-be-ignored mkdir -p rootdir/etc/apt/apt.conf.d/a-dir-that-will-be-ignored.list mkdir -p rootdir/etc/apt/apt.conf.d/a-dir-that-will-not-be-ignored.conf -testsuccessequal "N: Ignoring 'a-dir-that-will-not-be-ignored.conf' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/apt.conf.d/' as it is not a regular file" aptconfig shell +testsuccessequal "N: Ignoring 'a-dir-that-will-not-be-ignored.conf' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/apt.conf.d/' as it is not a regular file" aptconfig shell rmdir rootdir/etc/apt/apt.conf.d/a-dir-* -msgtest "Check for directory notices in preferences.d" +msgmsg "Check for directory notices in preferences.d" mkdir -p rootdir/etc/apt/preferences.d/a-dir-that-will-be-ignored mkdir -p rootdir/etc/apt/preferences.d/a-dir-that-will-be-ignored.conf mkdir -p rootdir/etc/apt/preferences.d/a-dir-that-will-not-be-ignored.pref |