commit a4e4ef38a27acf49dbaf56c85ec8012d8ca92661
author szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Mar 18 20:45:46 2014 +0000
committer szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Mar 18 20:45:46 2014 +0000
tree bcb5a49b9af7fbb9bf4824917f85271e745ab86a
parent fc616383808168751be20fbdada49eda7f57fa6a

Fix push-basic.sh.  How did it ever pass?  We may never know.

BUG=

Review URL: https://codereview.chromium.org/203383005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257738 0039d316-1c4b-4281-b951-d872f2087c98

tests/push-basic.sh

diff --git a/tests/push-basic.sh b/tests/push-basic.sh
index f84cdec..18936c1 100755
--- a/tests/push-basic.sh
+++ b/tests/push-basic.sh
@@ -45,7 +45,7 @@
        $URL/edit
 
   test_expect_success "Base URL contains branch name" \
-      "curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:' | grep -q '@master'"
+      "curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:[[:space:]]*[^<]' | grep -q '@master'"
 
   test_expect_success "git-cl push ok" \
     "$GIT_CL push -f"

tests/test-lib.sh

diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index 46d34de..4c19010 100755
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -100,7 +100,7 @@
     git commit -qam "second commit"
     # Hack: make sure master is not the current branch
     #       otherwise push will give a warning
-    git checkout -q -b foo
+    git checkout -q --detach master
   )
 }