From: "Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jeff Hostetler <jeffhost@microsoft.com>,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: [PATCH 08/16] t7527: add parameters to start_daemon to handle args and subshell
Date: Fri, 11 Mar 2022 21:14:55 +0000 [thread overview]
Message-ID: <6693900600f5b27525dfe7de78e73900306e0ab5.1647033303.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1174.git.1647033303.gitgitgadget@gmail.com>
From: Jeff Hostetler <jeffhost@microsoft.com>
fixup! t7527: create test for fsmonitor--daemon
Add parameters to start_daemon() and handle subshell and logging args.
Remove /dev/null from commands.
Fix &&-chaining of functions.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
t/t7527-builtin-fsmonitor.sh | 217 ++++++++++++++++++-----------------
1 file changed, 111 insertions(+), 106 deletions(-)
diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh
index 0ccbfb9616f..026382a0d86 100755
--- a/t/t7527-builtin-fsmonitor.sh
+++ b/t/t7527-builtin-fsmonitor.sh
@@ -11,30 +11,85 @@ then
fi
stop_daemon_delete_repo () {
- r=$1
- git -C $r fsmonitor--daemon stop >/dev/null 2>/dev/null
+ r=$1 &&
+ test_might_fail git -C $r fsmonitor--daemon stop &&
rm -rf $1
- return 0
}
start_daemon () {
- case "$#" in
- 1) r="-C $1";;
- *) r="";
- esac
+ r="" &&
+ tf="" &&
+ t2="" &&
+ tk="" &&
- git $r fsmonitor--daemon start || return $?
- git $r fsmonitor--daemon status || return $?
+ while test "$#" -ne 0
+ do
+ case "$1" in
+ -C)
+ shift;
+ test "$#" -ne 0 ||
+ { echo >&2 "error: -C requires arg"; exit 1; }
+ r="-C $1"
+ shift
+ ;;
+ -tf)
+ shift;
+ test "$#" -ne 0 ||
+ { echo >&2 "error: -tf requires arg"; exit 1; }
+ tf="$1"
+ shift
+ ;;
+ -t2)
+ shift;
+ test "$#" -ne 0 ||
+ { echo >&2 "error: -t2 requires arg"; exit 1; }
+ t2="$1"
+ shift
+ ;;
+ -tk)
+ shift;
+ test "$#" -ne 0 ||
+ { echo >&2 "error: -tk requires arg"; exit 1; }
+ tk="$1"
+ shift
+ ;;
+ *)
+ echo >&2 "error: unknown option: '$1'"
+ exit 1
+ ;;
+ esac
+ done &&
+
+ (
+ if test ! -z "$tf"
+ then
+ GIT_TRACE_FSMONITOR="$tf"
+ export GIT_TRACE_FSMONITOR
+ fi &&
+
+ if test ! -z "$t2"
+ then
+ GIT_TRACE2_PERF="$t2"
+ export GIT_TRACE2_PERF
+ fi &&
+
+ if test ! -z "$tk"
+ then
+ GIT_TEST_FSMONITOR_TOKEN="$tk"
+ export GIT_TEST_FSMONITOR_TOKEN
+ fi &&
- return 0
+ git $r fsmonitor--daemon start &&
+ git $r fsmonitor--daemon status
+ )
}
# Is a Trace2 data event present with the given catetory and key?
# We do not care what the value is.
#
have_t2_data_event () {
- c=$1
- k=$2
+ c=$1 &&
+ k=$2 &&
grep -e '"event":"data".*"category":"'"$c"'".*"key":"'"$k"'"'
}
@@ -43,7 +98,7 @@ test_expect_success 'explicit daemon start and stop' '
test_when_finished "stop_daemon_delete_repo test_explicit" &&
git init test_explicit &&
- start_daemon test_explicit &&
+ start_daemon -C test_explicit &&
git -C test_explicit fsmonitor--daemon stop &&
test_must_fail git -C test_explicit fsmonitor--daemon status
@@ -63,7 +118,7 @@ test_expect_success 'implicit daemon start' '
# but this test case is only concerned with whether the daemon was
# implicitly started.)
- GIT_TRACE2_EVENT="$(pwd)/.git/trace" \
+ GIT_TRACE2_EVENT="$PWD/.git/trace" \
test-tool -C test_implicit fsmonitor-client query --token 0 >actual &&
nul_to_q <actual >actual.filtered &&
grep "builtin:" actual.filtered &&
@@ -86,7 +141,7 @@ test_expect_success 'implicit daemon stop (delete .git)' '
git init test_implicit_1 &&
- start_daemon test_implicit_1 &&
+ start_daemon -C test_implicit_1 &&
# deleting the .git directory will implicitly stop the daemon.
rm -rf test_implicit_1/.git &&
@@ -110,7 +165,7 @@ test_expect_success 'implicit daemon stop (rename .git)' '
git init test_implicit_2 &&
- start_daemon test_implicit_2 &&
+ start_daemon -C test_implicit_2 &&
# renaming the .git directory will implicitly stop the daemon.
mv test_implicit_2/.git test_implicit_2/.xxx &&
@@ -128,7 +183,7 @@ test_expect_success 'cannot start multiple daemons' '
git init test_multiple &&
- start_daemon test_multiple &&
+ start_daemon -C test_multiple &&
test_must_fail git -C test_multiple fsmonitor--daemon start 2>actual &&
grep "fsmonitor--daemon is already running" actual &&
@@ -177,8 +232,7 @@ test_expect_success 'setup' '
# This is here in case something else fails first.
#
redundant_stop_daemon () {
- git fsmonitor--daemon stop
- return 0
+ test_might_fail git fsmonitor--daemon stop
}
test_expect_success 'update-index implicitly starts daemon' '
@@ -186,7 +240,7 @@ test_expect_success 'update-index implicitly starts daemon' '
test_must_fail git fsmonitor--daemon status &&
- GIT_TRACE2_EVENT="$(pwd)/.git/trace_implicit_1" \
+ GIT_TRACE2_EVENT="$PWD/.git/trace_implicit_1" \
git update-index --fsmonitor &&
git fsmonitor--daemon status &&
@@ -202,7 +256,7 @@ test_expect_success 'status implicitly starts daemon' '
test_must_fail git fsmonitor--daemon status &&
- GIT_TRACE2_EVENT="$(pwd)/.git/trace_implicit_2" \
+ GIT_TRACE2_EVENT="$PWD/.git/trace_implicit_2" \
git status >actual &&
git fsmonitor--daemon status &&
@@ -214,38 +268,38 @@ test_expect_success 'status implicitly starts daemon' '
'
edit_files () {
- echo 1 >modified
- echo 2 >dir1/modified
- echo 3 >dir2/modified
+ echo 1 >modified &&
+ echo 2 >dir1/modified &&
+ echo 3 >dir2/modified &&
>dir1/untracked
}
delete_files () {
- rm -f delete
- rm -f dir1/delete
+ rm -f delete &&
+ rm -f dir1/delete &&
rm -f dir2/delete
}
create_files () {
- echo 1 >new
- echo 2 >dir1/new
+ echo 1 >new &&
+ echo 2 >dir1/new &&
echo 3 >dir2/new
}
rename_files () {
- mv rename renamed
- mv dir1/rename dir1/renamed
+ mv rename renamed &&
+ mv dir1/rename dir1/renamed &&
mv dir2/rename dir2/renamed
}
file_to_directory () {
- rm -f delete
- mkdir delete
+ rm -f delete &&
+ mkdir delete &&
echo 1 >delete/new
}
directory_to_file () {
- rm -rf dir1
+ rm -rf dir1 &&
echo 1 >dir1
}
@@ -272,25 +326,20 @@ verify_status () {
# daemon) because these commands might implicitly restart the daemon.
clean_up_repo_and_stop_daemon () {
- git reset --hard HEAD
- git clean -fd
- git fsmonitor--daemon stop
+ git reset --hard HEAD &&
+ git clean -fd &&
+ test_might_fail git fsmonitor--daemon stop &&
rm -f .git/trace
}
test_expect_success 'edit some files' '
test_when_finished clean_up_repo_and_stop_daemon &&
- (
- GIT_TRACE_FSMONITOR="$(pwd)/.git/trace" &&
- export GIT_TRACE_FSMONITOR &&
-
- start_daemon
- ) &&
+ start_daemon -tf "$PWD/.git/trace" &&
edit_files &&
- test-tool fsmonitor-client query --token 0 >/dev/null 2>&1 &&
+ test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1/modified$" .git/trace &&
grep "^event: dir2/modified$" .git/trace &&
@@ -301,16 +350,11 @@ test_expect_success 'edit some files' '
test_expect_success 'create some files' '
test_when_finished clean_up_repo_and_stop_daemon &&
- (
- GIT_TRACE_FSMONITOR="$(pwd)/.git/trace" &&
- export GIT_TRACE_FSMONITOR &&
-
- start_daemon
- ) &&
+ start_daemon -tf "$PWD/.git/trace" &&
create_files &&
- test-tool fsmonitor-client query --token 0 >/dev/null 2>&1 &&
+ test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1/new$" .git/trace &&
grep "^event: dir2/new$" .git/trace &&
@@ -320,16 +364,11 @@ test_expect_success 'create some files' '
test_expect_success 'delete some files' '
test_when_finished clean_up_repo_and_stop_daemon &&
- (
- GIT_TRACE_FSMONITOR="$(pwd)/.git/trace" &&
- export GIT_TRACE_FSMONITOR &&
-
- start_daemon
- ) &&
+ start_daemon -tf "$PWD/.git/trace" &&
delete_files &&
- test-tool fsmonitor-client query --token 0 >/dev/null 2>&1 &&
+ test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1/delete$" .git/trace &&
grep "^event: dir2/delete$" .git/trace &&
@@ -339,16 +378,11 @@ test_expect_success 'delete some files' '
test_expect_success 'rename some files' '
test_when_finished clean_up_repo_and_stop_daemon &&
- (
- GIT_TRACE_FSMONITOR="$(pwd)/.git/trace" &&
- export GIT_TRACE_FSMONITOR &&
-
- start_daemon
- ) &&
+ start_daemon -tf "$PWD/.git/trace" &&
rename_files &&
- test-tool fsmonitor-client query --token 0 >/dev/null 2>&1 &&
+ test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1/rename$" .git/trace &&
grep "^event: dir2/rename$" .git/trace &&
@@ -361,16 +395,11 @@ test_expect_success 'rename some files' '
test_expect_success 'rename directory' '
test_when_finished clean_up_repo_and_stop_daemon &&
- (
- GIT_TRACE_FSMONITOR="$(pwd)/.git/trace" &&
- export GIT_TRACE_FSMONITOR &&
-
- start_daemon
- ) &&
+ start_daemon -tf "$PWD/.git/trace" &&
mv dirtorename dirrenamed &&
- test-tool fsmonitor-client query --token 0 >/dev/null 2>&1 &&
+ test-tool fsmonitor-client query --token 0 &&
grep "^event: dirtorename/*$" .git/trace &&
grep "^event: dirrenamed/*$" .git/trace
@@ -379,16 +408,11 @@ test_expect_success 'rename directory' '
test_expect_success 'file changes to directory' '
test_when_finished clean_up_repo_and_stop_daemon &&
- (
- GIT_TRACE_FSMONITOR="$(pwd)/.git/trace" &&
- export GIT_TRACE_FSMONITOR &&
-
- start_daemon
- ) &&
+ start_daemon -tf "$PWD/.git/trace" &&
file_to_directory &&
- test-tool fsmonitor-client query --token 0 >/dev/null 2>&1 &&
+ test-tool fsmonitor-client query --token 0 &&
grep "^event: delete$" .git/trace &&
grep "^event: delete/new$" .git/trace
@@ -397,16 +421,11 @@ test_expect_success 'file changes to directory' '
test_expect_success 'directory changes to a file' '
test_when_finished clean_up_repo_and_stop_daemon &&
- (
- GIT_TRACE_FSMONITOR="$(pwd)/.git/trace" &&
- export GIT_TRACE_FSMONITOR &&
-
- start_daemon
- ) &&
+ start_daemon -tf "$PWD/.git/trace" &&
directory_to_file &&
- test-tool fsmonitor-client query --token 0 >/dev/null 2>&1 &&
+ test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1$" .git/trace
'
@@ -424,15 +443,7 @@ test_expect_success 'flush cached data' '
git init test_flush &&
- (
- GIT_TEST_FSMONITOR_TOKEN=true &&
- export GIT_TEST_FSMONITOR_TOKEN &&
-
- GIT_TRACE_FSMONITOR="$(pwd)/.git/trace_daemon" &&
- export GIT_TRACE_FSMONITOR &&
-
- start_daemon test_flush
- ) &&
+ start_daemon -C test_flush -tf "$PWD/.git/trace_daemon" -tk true &&
# The daemon should have an initial token with no events in _0 and
# then a few (probably platform-specific number of) events in _1.
@@ -441,8 +452,8 @@ test_expect_success 'flush cached data' '
test-tool -C test_flush fsmonitor-client query --token "builtin:test_00000001:0" >actual_0 &&
nul_to_q <actual_0 >actual_q0 &&
- touch test_flush/file_1 &&
- touch test_flush/file_2 &&
+ > test_flush/file_1 &&
+ > test_flush/file_2 &&
test-tool -C test_flush fsmonitor-client query --token "builtin:test_00000001:0" >actual_1 &&
nul_to_q <actual_1 >actual_q1 &&
@@ -462,7 +473,7 @@ test_expect_success 'flush cached data' '
grep "^builtin:test_00000002:0Q$" actual_q2 &&
- touch test_flush/file_3 &&
+ > test_flush/file_3 &&
test-tool -C test_flush fsmonitor-client query --token "builtin:test_00000002:0" >actual_3 &&
nul_to_q <actual_3 >actual_q3 &&
@@ -485,15 +496,9 @@ test_expect_success 'setup worktree base' '
test_expect_success 'worktree with .git file' '
git -C wt-base worktree add ../wt-secondary &&
- (
- GIT_TRACE2_PERF="$(pwd)/trace2_wt_secondary" &&
- export GIT_TRACE2_PERF &&
-
- GIT_TRACE_FSMONITOR="$(pwd)/trace_wt_secondary" &&
- export GIT_TRACE_FSMONITOR &&
-
- start_daemon wt-secondary
- ) &&
+ start_daemon -C wt-secondary \
+ -tf "$PWD/trace_wt_secondary" \
+ -t2 "$PWD/trace2_wt_secondary" &&
git -C wt-secondary fsmonitor--daemon stop &&
test_must_fail git -C wt-secondary fsmonitor--daemon status
--
gitgitgadget
next prev parent reply other threads:[~2022-03-11 22:59 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 21:14 [PATCH 00/16] Builtin FSMonitor Part 2.5 Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 01/16] t/test-lib: avoid using git on LHS of pipe Jeff Hostetler via GitGitGadget
2022-03-14 6:00 ` Junio C Hamano
2022-03-11 21:14 ` [PATCH 02/16] update-index: convert advise() messages back to warning() Jeff Hostetler via GitGitGadget
2022-03-14 6:08 ` Junio C Hamano
2022-03-21 18:47 ` Jeff Hostetler
2022-03-11 21:14 ` [PATCH 03/16] compat/fsmonitor/fsm-listen-darwin: split out GCC-specific declarations Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 04/16] t/helper/fsmonitor-client: cleanup call to parse_options() Jeff Hostetler via GitGitGadget
2022-03-14 7:58 ` Ævar Arnfjörð Bjarmason
2022-03-11 21:14 ` [PATCH 05/16] fsmonitor--daemon: refactor cookie handling for readability Jeff Hostetler via GitGitGadget
2022-03-14 8:00 ` Ævar Arnfjörð Bjarmason
2022-03-14 14:49 ` Derrick Stolee
2022-03-14 17:47 ` Junio C Hamano
2022-03-21 19:26 ` Jeff Hostetler
2022-03-11 21:14 ` [PATCH 06/16] t/perf/p7519: use grep rather than egrep in test Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 07/16] t/perf/p7519: cleanup coding style Jeff Hostetler via GitGitGadget
2022-03-14 8:01 ` Ævar Arnfjörð Bjarmason
2022-03-11 21:14 ` Jeff Hostetler via GitGitGadget [this message]
2022-03-14 8:03 ` [PATCH 08/16] t7527: add parameters to start_daemon to handle args and subshell Ævar Arnfjörð Bjarmason
2022-03-11 21:14 ` [PATCH 09/16] t7527: fix && chaining in matrix_try() Jeff Hostetler via GitGitGadget
2022-03-14 6:15 ` Junio C Hamano
2022-03-11 21:14 ` [PATCH 10/16] t7527: delete unused verify_status() function Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 11/16] fsmonitor-ipc: add _() to calls to die() Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 12/16] compat/fsmonitor/fsm-listen-darwin: add _() to calls to error() Jeff Hostetler via GitGitGadget
2022-03-11 21:15 ` [PATCH 13/16] compat/fsmonitor/fsm-listen-win32: " Jeff Hostetler via GitGitGadget
2022-03-11 21:15 ` [PATCH 14/16] fsmonitor--daemon: add _() to calls to die() Jeff Hostetler via GitGitGadget
2022-03-11 21:15 ` [PATCH 15/16] fsmonitor--daemon: add _() to calls to error() Jeff Hostetler via GitGitGadget
2022-03-11 21:15 ` [PATCH 16/16] fsmonitor-settings: simplify initialization of settings data Jeff Hostetler via GitGitGadget
2022-03-14 19:49 ` Junio C Hamano
2022-03-15 18:26 ` Jeff Hostetler
2022-03-15 19:06 ` Junio C Hamano
2022-03-13 8:02 ` [PATCH 00/16] Builtin FSMonitor Part 2.5 Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6693900600f5b27525dfe7de78e73900306e0ab5.1647033303.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=jeffhost@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.