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 <kzak@redhat.com>

diff --git a/tests/expected/misc/configs-combined b/tests/expected/misc/configs-combined
index 9e1b57f045a3c859b30ff0980b1cddf2f4b3f154..abf49a4b804e61d1e4c0f7fe916ad255b52a07c7 100644 (file)
--- 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 a876fb9e8e1020550f25d43fcfe2f901ce16ddec..a2979913be778c0db72f07df30428c14614090bf 100644 (file)
--- 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 892bf41e076960bb3baa2913a471677e53eb531e..9210cfe689a670cf0885e27507ebbf645d59a0a7 100644 (file)
--- 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 d5f7afd607aed6d70b21329f7533d5319cc8c6e8..250afd3c3d42709a97d28ba34db1f36ff11f0054 100644 (file)
--- 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 c0877030df0313a9f74f798150bb71489f80b5f4..68a16d35cda57e18e4981c7d2e5b2a0ddb15e670 100644 (file)
--- 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 ad267849c4e137930ea49b1117b21f3cb0d621fa..308cac7ab27c36be997f2f90f963f75ecd731954 100644 (file)
--- 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 fbc18d5f67a9bd60e5bbc664a6ad621c03dac59d..9c7e0ddf801acedca5a0ccbb50a691491e16e347 100644 (file)
--- 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 6df41595d65ef8aee9592382629374c8fb114ace..c56caaf697adbc6670a8d4753b2fb7fa60451709 100755 (executable)
--- 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