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

Unified Diff: tests/basic.sh

Issue 2111543002: Do not remove issue from branch after it is landed manually (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Fix Created 4 years, 6 months 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.py ('k') | tests/push-basic.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/basic.sh
diff --git a/tests/basic.sh b/tests/basic.sh
index 0984ae042b6b8d40edd628b532a93d54becd6d1c..50d30bd925be106a46e07d8138218d7cd6416bfb 100755
--- a/tests/basic.sh
+++ b/tests/basic.sh
@@ -48,14 +48,14 @@ setup_gitsvn
test_expect_success "git-cl dcommits ok" \
"$GIT_CL dcommit -f --no-oauth2"
+ test_expect_success "branch still has an issue" \
+ "$GIT_CL_STATUS | grep -q 'Issue number'"
+
git checkout -q master
git svn -q rebase >/dev/null 2>&1
test_expect_success "dcommitted code has proper description" \
"git show | grep -q 'foo-quux'"
- test_expect_success "issue no longer has a branch" \
- "$GIT_CL_STATUS | grep -q 'work : None'"
-
test_expect_success "upstream svn has our commit" \
"svn log $REPO_URL 2>/dev/null | grep -q 'foo-quux'"
)
« no previous file with comments | « git_cl.py ('k') | tests/push-basic.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698