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

Side by Side Diff: tests/push-basic.sh

Issue 118613003: git_cl.py: In the "status" command, add space after the branch name. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: fix tests (maybe?) Created 7 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 unified diff | Download patch
« no previous file with comments | « tests/basic.sh ('k') | tests/push-from-logs.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 set -e 7 set -e
8 8
9 . ./test-lib.sh 9 . ./test-lib.sh
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 test_expect_success "git-cl push ok" \ 50 test_expect_success "git-cl push ok" \
51 "$GIT_CL push -f" 51 "$GIT_CL push -f"
52 52
53 git checkout -q master > /dev/null 2>&1 53 git checkout -q master > /dev/null 2>&1
54 git pull -q > /dev/null 2>&1 54 git pull -q > /dev/null 2>&1
55 55
56 test_expect_success "committed code has proper description" \ 56 test_expect_success "committed code has proper description" \
57 "git show | grep -q 'foo-quux'" 57 "git show | grep -q 'foo-quux'"
58 58
59 test_expect_success "issue no longer has a branch" \ 59 test_expect_success "issue no longer has a branch" \
60 "$GIT_CL_STATUS | grep -q 'work: None'" 60 "$GIT_CL_STATUS | grep -q 'work : None'"
61 61
62 cd $GITREPO_PATH 62 cd $GITREPO_PATH
63 test_expect_success "upstream repo has our commit" \ 63 test_expect_success "upstream repo has our commit" \
64 "git log master 2>/dev/null | grep -q 'foo-quux'" 64 "git log master 2>/dev/null | grep -q 'foo-quux'"
65 ) 65 )
66 SUCCESS=$? 66 SUCCESS=$?
67 67
68 cleanup 68 cleanup
69 69
70 if [ $SUCCESS == 0 ]; then 70 if [ $SUCCESS == 0 ]; then
71 echo PASS 71 echo PASS
72 fi 72 fi
OLDNEW
« no previous file with comments | « tests/basic.sh ('k') | tests/push-from-logs.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698