From 405bfefdc2ca11876b558d92acd9c09a3673043e Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Sun, 17 Nov 2019 19:27:41 -0800
Subject: [PATCH] e2e: don't pass one-time and wait

---
 test_e2e.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test_e2e.sh b/test_e2e.sh
index 388ba7b..521fe02 100755
--- a/test_e2e.sh
+++ b/test_e2e.sh
@@ -129,13 +129,12 @@ git -C "$REPO" commit -qam "$TESTCASE"
 GIT_SYNC \
     --logtostderr \
     --v=5 \
-    --wait=0.1 \
+    --one-time \
     --repo="$REPO" \
     --branch=master \
     --rev=HEAD \
     --root="$ROOT" \
     --dest="link" \
-    --one-time \
     > "$DIR"/log."$TESTCASE" 2>&1
 assert_link_exists "$ROOT"/link
 assert_file_exists "$ROOT"/link/file
@@ -478,12 +477,11 @@ REV=$(git -C "$REPO" rev-list -n1 HEAD)
 GIT_SYNC \
     --logtostderr \
     --v=5 \
-    --wait=0.1 \
+    --one-time \
     --repo="$REPO" \
     --rev="$REV" \
     --root="$ROOT" \
     --dest="link" \
-    --one-time \
     > "$DIR"/log."$TESTCASE" 2>&1
 assert_link_exists "$ROOT"/link
 assert_file_exists "$ROOT"/link/file
@@ -542,7 +540,7 @@ GIT_SYNC \
     --repo="$REPO" \
     --root="$ROOT" \
     --dest="link" \
-    > "$DIR"/log."$TESTCASE" 2>&1
+    > "$DIR"/log."$TESTCASE" 2>&1 || true
 # check for failure
 assert_file_absent "$ROOT"/link/file
 # run with slow_git but without timing out