Merge branch 'jh/t7527-unflake-by-forcing-cookie'
Make fsmonitor more robust to avoid the flakiness seen in t7527. * jh/t7527-unflake-by-forcing-cookie: fsmonitor: fix race seen in t7527
This commit is contained in:
commit
44265e5b57
@ -710,6 +710,7 @@ static int do_handle_client(struct fsmonitor_daemon_state *state,
|
||||
"fsmonitor: unsupported V1 protocol '%s'"),
|
||||
command);
|
||||
do_trivial = 1;
|
||||
do_cookie = 1;
|
||||
|
||||
} else {
|
||||
/* We have "builtin:*" */
|
||||
@ -719,6 +720,7 @@ static int do_handle_client(struct fsmonitor_daemon_state *state,
|
||||
"fsmonitor: invalid V2 protocol token '%s'",
|
||||
command);
|
||||
do_trivial = 1;
|
||||
do_cookie = 1;
|
||||
|
||||
} else {
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user