diff --git a/test_e2e.sh b/test_e2e.sh index 28cbd08..34a27ae 100755 --- a/test_e2e.sh +++ b/test_e2e.sh @@ -372,70 +372,6 @@ assert_file_eq "$ROOT"/link/file "$TESTCASE 1" # Wrap up pass -############################################## -# Test cross-branch tag syncing -############################################## -testcase "cross-branch-tag-sync" -BRANCH="$TESTCASE"--BRANCH -TAG="$TESTCASE"--TAG -# First sync -git -C "$REPO" checkout -q -b "$BRANCH" -echo "$TESTCASE 1" > "$REPO"/file -git -C "$REPO" commit -qam "$TESTCASE 1" -git -C "$REPO" tag -af "$TAG" -m "$TESTCASE 1" >/dev/null -git -C "$REPO" checkout -q master -GIT_SYNC \ - --logtostderr \ - --v=5 \ - --wait=0.1 \ - --repo="file://$REPO" \ - --rev="$TAG" \ - --root="$ROOT" \ - --dest="link" \ - > "$DIR"/log."$TESTCASE" 2>&1 & -sleep 3 -assert_link_exists "$ROOT"/link -assert_file_exists "$ROOT"/link/file -assert_file_eq "$ROOT"/link/file "$TESTCASE 1" -# Move the tag forward -git -C "$REPO" checkout -q "$BRANCH" -echo "$TESTCASE 2" > "$REPO"/file -git -C "$REPO" commit -qam "$TESTCASE 2" -git -C "$REPO" tag -af "$TAG" -m "$TESTCASE 1" >/dev/null -git -C "$REPO" checkout -q master -sleep 3 -assert_link_exists "$ROOT"/link -assert_file_exists "$ROOT"/link/file -assert_file_eq "$ROOT"/link/file "$TESTCASE 2" -# Move the tag backward -git -C "$REPO" checkout -q "$BRANCH" -git -C "$REPO" reset -q --hard HEAD^ -git -C "$REPO" tag -af "$TAG" -m "$TESTCASE 1" >/dev/null -git -C "$REPO" checkout -q master -sleep 3 -assert_link_exists "$ROOT"/link -assert_file_exists "$ROOT"/link/file -assert_file_eq "$ROOT"/link/file "$TESTCASE 1" -# Add something after the tag -git -C "$REPO" checkout -q "$BRANCH" -echo "$TESTCASE 3" > "$REPO"/file -git -C "$REPO" commit -qam "$TESTCASE 3" -git -C "$REPO" checkout -q master -sleep 3 -assert_link_exists "$ROOT"/link -assert_file_exists "$ROOT"/link/file -assert_file_eq "$ROOT"/link/file "$TESTCASE 1" -# Move the tag forward again -git -C "$REPO" checkout -q "$BRANCH" -git -C "$REPO" tag -af "$TAG" -m "$TESTCASE 3" >/dev/null -git -C "$REPO" checkout -q master -sleep 3 -assert_link_exists "$ROOT"/link -assert_file_exists "$ROOT"/link/file -assert_file_eq "$ROOT"/link/file "$TESTCASE 3" -# Wrap up -pass - ############################################## # Test rev syncing ##############################################