From 44ae940082e702451976f4c07c6b054ca505eb04 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 14 Oct 2025 13:20:42 +0200 Subject: [PATCH] tests: (configs) add file listings to expected output Add sorted file listings to the configs test output to help debug platform-specific test failures. Each subtest now outputs the actual files created in the test directory before running the config helper, making it easier to identify issues with filesystem ordering or file creation problems. Signed-off-by: Karel Zak --- tests/expected/misc/configs-combined | 4 ++++ tests/expected/misc/configs-dropin-etc | 2 ++ tests/expected/misc/configs-dropin-usr | 2 ++ tests/expected/misc/configs-main-etc | 1 + tests/expected/misc/configs-main-usr | 1 + tests/expected/misc/configs-masking | 2 ++ tests/expected/misc/configs-no-project | 1 + tests/ts/misc/configs | 7 +++++++ 8 files changed, 20 insertions(+) diff --git a/tests/expected/misc/configs-combined b/tests/expected/misc/configs-combined index 9e1b57f04..abf49a4b8 100644 --- a/tests/expected/misc/configs-combined +++ b/tests/expected/misc/configs-combined @@ -1,3 +1,7 @@ +@TESTDIR@/etc/proj/example.conf +@TESTDIR@/etc/proj/example.conf.d/30-local.conf +@TESTDIR@/run/proj/example.conf.d/20-override.conf +@TESTDIR@/usr/proj/example.conf.d/10-base.conf Found 4 configuration file(s): @TESTDIR@/etc/proj/example.conf @TESTDIR@/usr/proj/example.conf.d/10-base.conf diff --git a/tests/expected/misc/configs-dropin-etc b/tests/expected/misc/configs-dropin-etc index a876fb9e8..a2979913b 100644 --- a/tests/expected/misc/configs-dropin-etc +++ b/tests/expected/misc/configs-dropin-etc @@ -1,3 +1,5 @@ +@TESTDIR@/etc/proj/example.conf.d/10-first.conf +@TESTDIR@/etc/proj/example.conf.d/20-second.conf Found 2 configuration file(s): @TESTDIR@/etc/proj/example.conf.d/10-first.conf @TESTDIR@/etc/proj/example.conf.d/20-second.conf diff --git a/tests/expected/misc/configs-dropin-usr b/tests/expected/misc/configs-dropin-usr index 892bf41e0..9210cfe68 100644 --- a/tests/expected/misc/configs-dropin-usr +++ b/tests/expected/misc/configs-dropin-usr @@ -1,3 +1,5 @@ +@TESTDIR@/usr/proj/example.conf.d/10-first.conf +@TESTDIR@/usr/proj/example.conf.d/20-second.conf Found 2 configuration file(s): @TESTDIR@/usr/proj/example.conf.d/10-first.conf @TESTDIR@/usr/proj/example.conf.d/20-second.conf diff --git a/tests/expected/misc/configs-main-etc b/tests/expected/misc/configs-main-etc index d5f7afd60..250afd3c3 100644 --- a/tests/expected/misc/configs-main-etc +++ b/tests/expected/misc/configs-main-etc @@ -1,2 +1,3 @@ +@TESTDIR@/etc/proj/example.conf Found 1 configuration file(s): @TESTDIR@/etc/proj/example.conf diff --git a/tests/expected/misc/configs-main-usr b/tests/expected/misc/configs-main-usr index c0877030d..68a16d35c 100644 --- a/tests/expected/misc/configs-main-usr +++ b/tests/expected/misc/configs-main-usr @@ -1,2 +1,3 @@ +@TESTDIR@/usr/proj/example.conf Found 1 configuration file(s): @TESTDIR@/usr/proj/example.conf diff --git a/tests/expected/misc/configs-masking b/tests/expected/misc/configs-masking index ad267849c..308cac7ab 100644 --- a/tests/expected/misc/configs-masking +++ b/tests/expected/misc/configs-masking @@ -1,2 +1,4 @@ +@TESTDIR@/etc/proj/example.conf.d/10-config.conf +@TESTDIR@/usr/proj/example.conf.d/10-config.conf Found 1 configuration file(s): @TESTDIR@/etc/proj/example.conf.d/10-config.conf diff --git a/tests/expected/misc/configs-no-project b/tests/expected/misc/configs-no-project index fbc18d5f6..9c7e0ddf8 100644 --- a/tests/expected/misc/configs-no-project +++ b/tests/expected/misc/configs-no-project @@ -1,2 +1,3 @@ +@TESTDIR@/etc/test.conf Found 1 configuration file(s): @TESTDIR@/etc//test.conf diff --git a/tests/ts/misc/configs b/tests/ts/misc/configs index 6df41595d..c56caaf69 100755 --- a/tests/ts/misc/configs +++ b/tests/ts/misc/configs @@ -28,6 +28,7 @@ mkdir -p "$USR_DIR/proj" # Test 1: Main config file in /etc ts_init_subtest "main-etc" echo "main config" > "$ETC_DIR/proj/example.conf" +find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \ --project "proj" --name "example" --suffix "conf" \ | sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG @@ -37,6 +38,7 @@ ts_finalize_subtest # Test 2: Main config file in /usr (fallback) ts_init_subtest "main-usr" echo "usr config" > "$USR_DIR/proj/example.conf" +find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \ --project "proj" --name "example" --suffix "conf" \ | sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG @@ -48,6 +50,7 @@ ts_init_subtest "dropin-etc" mkdir -p "$ETC_DIR/proj/example.conf.d" echo "etc drop-in 1" > "$ETC_DIR/proj/example.conf.d/10-first.conf" echo "etc drop-in 2" > "$ETC_DIR/proj/example.conf.d/20-second.conf" +find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \ --project "proj" --name "example" --suffix "conf" \ | sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG @@ -59,6 +62,7 @@ ts_init_subtest "dropin-usr" mkdir -p "$USR_DIR/proj/example.conf.d" echo "usr drop-in 1" > "$USR_DIR/proj/example.conf.d/10-first.conf" echo "usr drop-in 2" > "$USR_DIR/proj/example.conf.d/20-second.conf" +find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \ --project "proj" --name "example" --suffix "conf" \ | sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG @@ -74,6 +78,7 @@ mkdir -p "$USR_DIR/proj/example.conf.d" echo "usr drop-in" > "$USR_DIR/proj/example.conf.d/10-base.conf" echo "run drop-in" > "$RUN_DIR/proj/example.conf.d/20-override.conf" echo "etc drop-in" > "$ETC_DIR/proj/example.conf.d/30-local.conf" +find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \ --project "proj" --name "example" --suffix "conf" \ | sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG @@ -89,6 +94,7 @@ mkdir -p "$ETC_DIR/proj/example.conf.d" mkdir -p "$USR_DIR/proj/example.conf.d" echo "usr version" > "$USR_DIR/proj/example.conf.d/10-config.conf" echo "etc version" > "$ETC_DIR/proj/example.conf.d/10-config.conf" +find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \ --project "proj" --name "example" --suffix "conf" \ | sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG @@ -100,6 +106,7 @@ ts_finalize_subtest ts_init_subtest "no-project" mkdir -p "$ETC_DIR" echo "root config" > "$ETC_DIR/test.conf" +find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \ --name "test" --suffix "conf" \ | sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG -- 2.47.3