e2e: don't pass one-time and wait
This commit is contained in:
parent
5e82e574ac
commit
405bfefdc2
|
|
@ -129,13 +129,12 @@ git -C "$REPO" commit -qam "$TESTCASE"
|
||||||
GIT_SYNC \
|
GIT_SYNC \
|
||||||
--logtostderr \
|
--logtostderr \
|
||||||
--v=5 \
|
--v=5 \
|
||||||
--wait=0.1 \
|
--one-time \
|
||||||
--repo="$REPO" \
|
--repo="$REPO" \
|
||||||
--branch=master \
|
--branch=master \
|
||||||
--rev=HEAD \
|
--rev=HEAD \
|
||||||
--root="$ROOT" \
|
--root="$ROOT" \
|
||||||
--dest="link" \
|
--dest="link" \
|
||||||
--one-time \
|
|
||||||
> "$DIR"/log."$TESTCASE" 2>&1
|
> "$DIR"/log."$TESTCASE" 2>&1
|
||||||
assert_link_exists "$ROOT"/link
|
assert_link_exists "$ROOT"/link
|
||||||
assert_file_exists "$ROOT"/link/file
|
assert_file_exists "$ROOT"/link/file
|
||||||
|
|
@ -478,12 +477,11 @@ REV=$(git -C "$REPO" rev-list -n1 HEAD)
|
||||||
GIT_SYNC \
|
GIT_SYNC \
|
||||||
--logtostderr \
|
--logtostderr \
|
||||||
--v=5 \
|
--v=5 \
|
||||||
--wait=0.1 \
|
--one-time \
|
||||||
--repo="$REPO" \
|
--repo="$REPO" \
|
||||||
--rev="$REV" \
|
--rev="$REV" \
|
||||||
--root="$ROOT" \
|
--root="$ROOT" \
|
||||||
--dest="link" \
|
--dest="link" \
|
||||||
--one-time \
|
|
||||||
> "$DIR"/log."$TESTCASE" 2>&1
|
> "$DIR"/log."$TESTCASE" 2>&1
|
||||||
assert_link_exists "$ROOT"/link
|
assert_link_exists "$ROOT"/link
|
||||||
assert_file_exists "$ROOT"/link/file
|
assert_file_exists "$ROOT"/link/file
|
||||||
|
|
@ -542,7 +540,7 @@ GIT_SYNC \
|
||||||
--repo="$REPO" \
|
--repo="$REPO" \
|
||||||
--root="$ROOT" \
|
--root="$ROOT" \
|
||||||
--dest="link" \
|
--dest="link" \
|
||||||
> "$DIR"/log."$TESTCASE" 2>&1
|
> "$DIR"/log."$TESTCASE" 2>&1 || true
|
||||||
# check for failure
|
# check for failure
|
||||||
assert_file_absent "$ROOT"/link/file
|
assert_file_absent "$ROOT"/link/file
|
||||||
# run with slow_git but without timing out
|
# run with slow_git but without timing out
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue