Commit 1a5cb6e5 authored by dpranke@chromium.org's avatar dpranke@chromium.org

fix git-cl test scripts. I'm not sure when, but if these ever passed,

then at some point prior to my recent changes "git-cl upload master..."
stopped working and you need to do only "git-cl upload master".

Review URL: http://codereview.chromium.org/6679033

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@78082 0039d316-1c4b-4281-b951-d872f2087c98
parent 68f27462
......@@ -20,7 +20,7 @@ setup_gitsvn
git add test; git commit -q -m "branch work"
export EDITOR=$(which true)
test_expect_success "upload succeeds" \
"$GIT_CL upload -m test master... | grep -q 'Issue created'"
"$GIT_CL upload -m test master | grep -q 'Issue created'"
# Switch back to master, delete the branch.
git checkout master
......
......@@ -28,7 +28,7 @@ setup_gitsvn
export EDITOR=$(which true)
test_expect_success "upload succeeds (needs a server running on localhost)" \
"$GIT_CL upload -m test master... | grep -q 'Issue created'"
"$GIT_CL upload -m test master | grep -q 'Issue created'"
test_expect_success "git-cl status now knows the issue" \
"$GIT_CL status | grep -q 'Issue number'"
......
......@@ -11,8 +11,8 @@ setup_initsvn
setup_gitsvn
setup_hooks() {
upload_retval = shift
dcommit_retval = shift
upload_retval=$1
dcommit_retval=$2
echo > PRESUBMIT.py <<END
def CheckChangeOnUpload(input_api, output_api):
......
......@@ -32,7 +32,7 @@ END
"$GIT_CL status | grep -q 'R=ben@chromium.org'"
test_expect_failure "git-cl dcommit fails w/ missing LGTM" \
"$GIT_CL dcommit"
"$GIT_CL dcommit -f"
test_expect_success "git-cl dcommit --tbr succeeds" \
"$GIT_CL dcommit --tbr -f | grep -q -- '--tbr was specified'"
......
......@@ -27,7 +27,7 @@ setup_gitgit
# Prevent the editor from coming up when you upload.
export EDITOR=$(which true)
test_expect_success "upload succeeds (needs a server running on localhost)" \
"$GIT_CL upload -m test master... | grep -q 'Issue created'"
"$GIT_CL upload -m test master | grep -q 'Issue created'"
test_expect_success "git-cl status now knows the issue" \
"$GIT_CL status | grep -q 'Issue number'"
......
......@@ -27,7 +27,7 @@ setup_gitgit
# Prevent the editor from coming up when you upload.
export EDITOR=$(which true)
test_expect_success "upload succeeds (needs a server running on localhost)" \
"$GIT_CL upload -m test --desc_from_logs master... | \
"$GIT_CL upload -m test --desc_from_logs master | \
grep -q 'Issue created'"
test_expect_success "git-cl status now knows the issue" \
......
......@@ -20,7 +20,7 @@ setup_gitsvn
git commit -q -m "renamed"
export EDITOR=$(which true)
test_expect_success "upload succeeds" \
"$GIT_CL upload -m test master... | grep -q 'Issue created'"
"$GIT_CL upload -m test master | grep -q 'Issue created'"
# Look at the uploaded patch and verify it is a rename patch.
echo "Rename test not fully implemented yet. :("
......
......@@ -24,7 +24,7 @@ setup_gitsvn
git add test; git commit -q -m "branch work"
export EDITOR=$(which true)
test_expect_success "upload succeeds" \
"$GIT_CL upload -m test master... | grep -q 'Issue created'"
"$GIT_CL upload -m test master | grep -q 'Issue created'"
test_expect_success "git-cl dcommits ok" \
"$GIT_CL dcommit -f"
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment