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

Side by Side Diff: tests/push-from-logs.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/push-basic.sh ('k') | no next file » | 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 test_expect_success "git-cl push ok" \ 49 test_expect_success "git-cl push ok" \
50 "$GIT_CL push -f" 50 "$GIT_CL push -f"
51 51
52 git checkout -q master > /dev/null 2>&1 52 git checkout -q master > /dev/null 2>&1
53 git pull -q > /dev/null 2>&1 53 git pull -q > /dev/null 2>&1
54 54
55 test_expect_success "committed code has proper description" \ 55 test_expect_success "committed code has proper description" \
56 "git show | [ $( egrep -q '^branch work$' -c ) -eq 2 ] 56 "git show | [ $( egrep -q '^branch work$' -c ) -eq 2 ]
57 57
58 test_expect_success "issue no longer has a branch" \ 58 test_expect_success "issue no longer has a branch" \
59 "$GIT_CL_STATUS | grep -q 'work: None'" 59 "$GIT_CL_STATUS | grep -q 'work : None'"
60 60
61 cd $GITREPO_PATH 61 cd $GITREPO_PATH
62 test_expect_success "upstream repo has our commit" \ 62 test_expect_success "upstream repo has our commit" \
63 "git log master 2>/dev/null | [ $( egrep -q '^branch work$' -c ) -eq 2 ] 63 "git log master 2>/dev/null | [ $( egrep -q '^branch work$' -c ) -eq 2 ]
64 ) 64 )
65 SUCCESS=$? 65 SUCCESS=$?
66 66
67 cleanup 67 cleanup
68 68
69 if [ $SUCCESS == 0 ]; then 69 if [ $SUCCESS == 0 ]; then
70 echo PASS 70 echo PASS
71 fi 71 fi
OLDNEW
« no previous file with comments | « tests/push-basic.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698