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

Side by Side Diff: tests/push-from-logs.sh

Issue 1095033002: Enable OAuth2 by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: fix smoke tests Created 5 years, 8 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 | « tests/push-basic.sh ('k') | tests/rename.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_initgit 11 setup_initgit
12 setup_gitgit 12 setup_gitgit
13 13
14 ( 14 (
15 set -e 15 set -e
16 cd git-git 16 cd git-git
17 git checkout -q --track -b work origin 17 git checkout -q --track -b work origin
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 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'"
30 30
31 # Prevent the editor from coming up when you upload. 31 # Prevent the editor from coming up when you upload.
32 export EDITOR=$(which true) 32 export EDITOR=$(which true)
33 test_expect_success "upload succeeds (needs a server running on localhost)" \ 33 test_expect_success "upload succeeds (needs a server running on localhost)" \
34 "$GIT_CL upload -m test master | \ 34 "$GIT_CL upload --no-oauth2 -m test master | \
35 grep -q 'Issue created'" 35 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
40 # Check to see if the description contains the local commit messages. 40 # Check to see if the description contains the local commit messages.
41 # Should contain 'branch work' x 2. 41 # Should contain 'branch work' x 2.
42 test_expect_success "git-cl status has the right description for the log" \ 42 test_expect_success "git-cl status has the right description for the log" \
43 "$GIT_CL_STATUS --field desc | [ $( egrep -q '^branch work$' -c ) -eq 2 ] 43 "$GIT_CL_STATUS --field desc | [ $( egrep -q '^branch work$' -c ) -eq 2 ]
44 44
45 test_expect_success "git-cl status has the right subject from message" \ 45 test_expect_success "git-cl status has the right subject from message" \
46 "$GIT_CL_STATUS --field desc | \ 46 "$GIT_CL_STATUS --field desc | \
47 [ $( egrep -q '^test$' --byte-offset) | grep '^0:' ] 47 [ $( egrep -q '^test$' --byte-offset) | grep '^0:' ]
48 48
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 --no-oauth2"
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') | tests/rename.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698