From 1a5cb6e5a839a59261f079e31f162c3b77055e65 Mon Sep 17 00:00:00 2001
From: "dpranke@chromium.org"
 <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 14 Mar 2011 20:11:29 +0000
Subject: [PATCH] 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
---
 git_cl/test/abandon.sh             | 2 +-
 git_cl/test/basic.sh               | 2 +-
 git_cl/test/hooks.sh               | 4 ++--
 git_cl/test/owners.sh              | 2 +-
 git_cl/test/push-basic.sh          | 2 +-
 git_cl/test/push-from-logs.sh      | 2 +-
 git_cl/test/rename.sh              | 2 +-
 git_cl/test/submit-from-new-dir.sh | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/git_cl/test/abandon.sh b/git_cl/test/abandon.sh
index 08760bddbb..85c49ca301 100755
--- a/git_cl/test/abandon.sh
+++ b/git_cl/test/abandon.sh
@@ -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
diff --git a/git_cl/test/basic.sh b/git_cl/test/basic.sh
index cbf3c0221b..9412f80b21 100755
--- a/git_cl/test/basic.sh
+++ b/git_cl/test/basic.sh
@@ -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'"
diff --git a/git_cl/test/hooks.sh b/git_cl/test/hooks.sh
index 26536d02b0..93d6bb432b 100755
--- a/git_cl/test/hooks.sh
+++ b/git_cl/test/hooks.sh
@@ -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):
diff --git a/git_cl/test/owners.sh b/git_cl/test/owners.sh
index 4c3ad72008..766abcc262 100755
--- a/git_cl/test/owners.sh
+++ b/git_cl/test/owners.sh
@@ -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'"
diff --git a/git_cl/test/push-basic.sh b/git_cl/test/push-basic.sh
index e9876e1735..9a19cf3526 100755
--- a/git_cl/test/push-basic.sh
+++ b/git_cl/test/push-basic.sh
@@ -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'"
diff --git a/git_cl/test/push-from-logs.sh b/git_cl/test/push-from-logs.sh
index 264082c3f4..1a1f3d0969 100755
--- a/git_cl/test/push-from-logs.sh
+++ b/git_cl/test/push-from-logs.sh
@@ -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" \
diff --git a/git_cl/test/rename.sh b/git_cl/test/rename.sh
index 985693b225..2f56ddef74 100755
--- a/git_cl/test/rename.sh
+++ b/git_cl/test/rename.sh
@@ -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.  :("
diff --git a/git_cl/test/submit-from-new-dir.sh b/git_cl/test/submit-from-new-dir.sh
index 4766e245a5..7ed85f31f3 100755
--- a/git_cl/test/submit-from-new-dir.sh
+++ b/git_cl/test/submit-from-new-dir.sh
@@ -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"
 )