|| ts_die "timeout waiting for flock child"
ts_init_subtest "${subtest_prefix}non-block"
- do_lock "${api_arg} --nonblock --conflict-exit-code 123" 123 "You will never see this!"
+ do_lock "${api_arg} --nonblocking --conflict-exit-code 123" 123 "You will never see this!"
ts_finalize_subtest
ts_init_subtest "${subtest_prefix}no-fork"
- do_lock "${api_arg} --no-fork --nonblock --conflict-exit-code 123" 123 "You will never see this!"
+ do_lock "${api_arg} --no-fork --nonblocking --conflict-exit-code 123" 123 "You will never see this!"
ts_finalize_subtest
# this is the same as non-block test (exclusive lock is the default), but here
# we explicitly specify --exclusive on command line
ts_init_subtest "${subtest_prefix}exclusive"
- do_lock "${api_arg} --nonblock --exclusive --conflict-exit-code 123" 123 "You will never see this!"
+ do_lock "${api_arg} --nb --exclusive --conflict-exit-code 123" 123 "You will never see this!"
ts_finalize_subtest
cd "$TS_OUTDIR" || ts_failed "failed to change directory to $TS_OUTDIR"
rm 4 2> /dev/null
exec 4<>$TS_OUTDIR/lockfile || ts_log "Could not open lockfile"
- $TS_CMD_FLOCK $api_arg --nonblock --exclusive --conflict-exit-code 123 4 \
+ $TS_CMD_FLOCK $api_arg --nonblocking --exclusive --conflict-exit-code 123 4 \
>> $TS_OUTPUT 2>> $TS_ERRLOG
rc="$?"