Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: git_cl/test/push-from-logs.sh

Issue 5012006: Move git-cl into depot_tools.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: '' Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « git_cl/test/push-basic.sh ('k') | git_cl/test/rename.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: git_cl/test/push-from-logs.sh
===================================================================
--- git_cl/test/push-from-logs.sh (revision 0)
+++ git_cl/test/push-from-logs.sh (revision 0)
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+set -e
+
+. ./test-lib.sh
+
+setup_initgit
+setup_gitgit
+
+(
+ set -e
+ cd git-git
+ git checkout -q --track -b work origin
+ echo "some work done on a branch" >> test
+ git add test; git commit -q -m "branch work"
+ echo "some other work done on a branch" >> test
+ git add test; git commit -q -m "branch work"
+
+ test_expect_success "git-cl upload wants a server" \
+ "$GIT_CL upload 2>&1 | grep -q 'You must configure'"
+
+ git config rietveld.server localhost:8080
+
+ test_expect_success "git-cl status has no issue" \
+ "$GIT_CL status | grep -q 'no issue'"
+
+ # 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... | \
+ grep -q 'Issue created'"
+
+ test_expect_success "git-cl status now knows the issue" \
+ "$GIT_CL status | grep -q 'Issue number'"
+
+ # Check to see if the description contains the local commit messages.
+ # Should contain 'branch work' x 2.
+ test_expect_success "git-cl status has the right description for the log" \
+ "$GIT_CL status --field desc | [ $( egrep -q '^branch work$' -c ) -eq 2 ]
+
+ test_expect_success "git-cl status has the right subject from message" \
+ "$GIT_CL status --field desc | \
+ [ $( egrep -q '^test$' --byte-offset) | grep '^0:' ]
+
+ test_expect_success "git-cl push ok" \
+ "$GIT_CL push -f"
+
+ git checkout -q master > /dev/null 2>&1
+ git pull -q > /dev/null 2>&1
+
+ test_expect_success "committed code has proper description" \
+ "git show | [ $( egrep -q '^branch work$' -c ) -eq 2 ]
+
+ test_expect_success "issue no longer has a branch" \
+ "git cl status | grep -q 'work: None'"
+
+ cd $GITREPO_PATH
+ test_expect_success "upstream repo has our commit" \
+ "git log master 2>/dev/null | [ $( egrep -q '^branch work$' -c ) -eq 2 ]
+)
+SUCCESS=$?
+
+cleanup
+
+if [ $SUCCESS == 0 ]; then
+ echo PASS
+fi
Property changes on: git_cl/test/push-from-logs.sh
___________________________________________________________________
Added: svn:executable
+ *
« no previous file with comments | « git_cl/test/push-basic.sh ('k') | git_cl/test/rename.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698