X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fworking-directory%2Ftest_relayd_working_directory;h=0a5bad027bb8f0b995ad8b6451e49299423c1460;hp=6231ece0ed37bb40961f8c6a2c31e127cb916598;hb=e7b7a0e3be68a5a9cadb2d98aed69be873f7563c;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33 diff --git a/tests/regression/tools/working-directory/test_relayd_working_directory b/tests/regression/tools/working-directory/test_relayd_working_directory index 6231ece0e..0a5bad027 100755 --- a/tests/regression/tools/working-directory/test_relayd_working_directory +++ b/tests/regression/tools/working-directory/test_relayd_working_directory @@ -145,35 +145,47 @@ function test_relayd_background_no_working_dir() function test_relayd_debug_permission() { - local output_pattern='Working directory \".*\" is not writable' - local working_dir - local cwd - local pid - - working_dir=$(realpath "$(mktemp -d)") + local is_user diag "Test lttng-relayd change working directory on non writable directory" - # Removing write access to working dir - okx chmod -w "$working_dir" + if [ "$(id -u)" == "0" ]; then + is_user=0 + else + is_user=1 + fi - # Redirect the error output to a temporary file - ERROR_OUTPUT_DEST=$(mktemp) - start_lttng_relayd_opt 1 "-b" "-v --working-dir $working_dir" + skip $is_user "Skipping permission debug output test; operation can't fail as root" 6 || + { + local output_pattern='Working directory \".*\" is not writable' + local working_dir + local cwd + local pid - pid=$(pgrep "$RELAYD_MATCH") - ok $? "Found lttng-relayd" + working_dir=$(realpath "$(mktemp -d)") - cwd=$(readlink "/proc/${pid}/cwd") - is "$cwd" "$working_dir" "Working directory changed" + # Removing write access to working dir + okx chmod -w "$working_dir" - grep -q "$output_pattern" "$ERROR_OUTPUT_DEST" - ok $? "Warning about missing write permission is present" + # Redirect the error output to a temporary file - stop_lttng_relayd - rm "$ERROR_OUTPUT_DEST" - rm -rf "$working_dir" "$ERROR_OUTPUT_DEST" - ERROR_OUTPUT_DEST=/dev/null + ERROR_OUTPUT_DEST=$(mktemp) + start_lttng_relayd_opt 1 "-b" "-v --working-dir $working_dir" + + pid=$(pgrep "$RELAYD_MATCH") + ok $? "Found lttng-relayd" + + cwd=$(readlink "/proc/${pid}/cwd") + is "$cwd" "$working_dir" "Working directory changed" + + grep -q "$output_pattern" "$ERROR_OUTPUT_DEST" + ok $? "Warning about missing write permission is present" + + stop_lttng_relayd + rm "$ERROR_OUTPUT_DEST" + rm -rf "$working_dir" "$ERROR_OUTPUT_DEST" + ERROR_OUTPUT_DEST=/dev/null + } } function test_relayd_failure()