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

Side by Side Diff: tests/basic.sh

Issue 1263253002: Make 'git cl status' report the current branch even if there's no active CL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: presubmit test fixes Created 5 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « git_cl.py ('k') | tests/push-basic.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 #!/usr/bin/env bash 1 #!/usr/bin/env 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
11 setup_initsvn 11 setup_initsvn
12 setup_gitsvn 12 setup_gitsvn
13 13
14 ( 14 (
15 set -e 15 set -e
16 cd git-svn 16 cd git-svn
17 git checkout -q -b work 17 git checkout -q -b work
18 echo "some work done on a branch" >> test 18 echo "some work done on a branch" >> test
19 git add test; git commit -q -m "branch work" 19 git add test; git commit -q -m "branch work"
20 echo "some other work done on a branch" >> test 20 echo "some other work done on a branch" >> test
21 git add test; git commit -q -m "branch work" 21 git add test; git commit -q -m "branch work"
22 22
23 test_expect_success "git-cl upload wants a server" \ 23 test_expect_success "git-cl upload wants a server" \
24 "$GIT_CL upload --no-oauth2 2>&1 | grep -q 'You must configure'" 24 "$GIT_CL upload --no-oauth2 2>&1 | grep -q 'You must configure'"
25 25
26 git config rietveld.server localhost:10000 26 git config rietveld.server localhost:10000
27 27
28 test_expect_success "git-cl status has no issue" \ 28 test_expect_success "git-cl status has no issue" \
29 "$GIT_CL_STATUS | grep -q 'no issue'" 29 "$GIT_CL_STATUS | grep -q 'No issue assigned'"
30 30
31 # Prevent the editor from coming up when you upload. 31 # Prevent the editor from coming up when you upload.
32 export GIT_EDITOR=$(which true) 32 export GIT_EDITOR=$(which true)
33 33
34 test_expect_success "upload succeeds (needs a server running on localhost)" \ 34 test_expect_success "upload succeeds (needs a server running on localhost)" \
35 "$GIT_CL upload --no-oauth2 -m test master | grep -q 'Issue created'" 35 "$GIT_CL upload --no-oauth2 -m test master | grep -q 'Issue created'"
36 36
37 test_expect_success "git-cl status now knows the issue" \ 37 test_expect_success "git-cl status now knows the issue" \
38 "$GIT_CL_STATUS | grep -q 'Issue number'" 38 "$GIT_CL_STATUS | grep -q 'Issue number'"
39 39
(...skipping 19 matching lines...) Expand all
59 test_expect_success "upstream svn has our commit" \ 59 test_expect_success "upstream svn has our commit" \
60 "svn log $REPO_URL 2>/dev/null | grep -q 'foo-quux'" 60 "svn log $REPO_URL 2>/dev/null | grep -q 'foo-quux'"
61 ) 61 )
62 SUCCESS=$? 62 SUCCESS=$?
63 63
64 cleanup 64 cleanup
65 65
66 if [ $SUCCESS == 0 ]; then 66 if [ $SUCCESS == 0 ]; then
67 echo PASS 67 echo PASS
68 fi 68 fi
OLDNEW
« 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