From a05dd4bd2f4639e3e048bec07d7f266702cfc1fa Mon Sep 17 00:00:00 2001 From: Tim Stack Date: Wed, 19 Jul 2023 05:41:13 -0700 Subject: [PATCH] [tests] scrub out $UID in test output --- TESTS_ENVIRONMENT.in | 2 ++ .../test_cli.sh_10c33e465ef7681c6b5519d05d557426b26cd43d.err | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/TESTS_ENVIRONMENT.in b/TESTS_ENVIRONMENT.in index 42de4972..48aa143f 100644 --- a/TESTS_ENVIRONMENT.in +++ b/TESTS_ENVIRONMENT.in @@ -106,6 +106,7 @@ run_cap_test() { -e "s;${builddir};{test_dir};g" \ -e "s;${top_srcdir};{top_srcdir};g" \ -e "s;${top_srcdir_parent};{top_srcdir_parent};g" \ + -e "s;lnav-user-${UID}-work;lnav-user-{uid}-work;g" \ ${test_file_base}_${test_hash}.out echo printf "%s \033[0;35m=============================================================\033[0m\n" $(date -Iseconds) @@ -133,6 +134,7 @@ run_cap_test() { -e "s;${test_dir};{test_dir};g" \ -e "s;${builddir};{builddir};g" \ -e "s;${top_srcdir};{top_srcdir};g" \ + -e "s;lnav-user-${UID}-work;lnav-user-{uid}-work;g" \ -e 's;"errorId":".+";;g' \ ${test_file_base}_${test_hash}.err printf '\033[0;31mBEGIN\033[0m %s\n' "${test_file_base}_${test_hash}.err" diff --git a/test/expected/test_cli.sh_10c33e465ef7681c6b5519d05d557426b26cd43d.err b/test/expected/test_cli.sh_10c33e465ef7681c6b5519d05d557426b26cd43d.err index 111ae4e1..13bd84fa 100644 --- a/test/expected/test_cli.sh_10c33e465ef7681c6b5519d05d557426b26cd43d.err +++ b/test/expected/test_cli.sh_10c33e465ef7681c6b5519d05d557426b26cd43d.err @@ -1,4 +1,4 @@ ⓘ info: the following piper captures were found in: - piper-tmp/lnav-user-501-work/piper + piper-tmp/lnav-user-{uid}-work/piper  = note: The captures currently consume 31B of disk space. File sizes include associated metadata.  = help: You can reopen a capture by passing the piper URL to lnav