OLD | NEW |
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_git_remote |
12 setup_gitgit | 12 setup_git_checkout |
13 | 13 |
14 ( | 14 ( |
15 set -e | 15 set -e |
16 cd git-git | 16 cd git_checkout |
17 git checkout -q --track -b work origin | 17 git checkout -q -t origin/master -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 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 --no-oauth2 -m test master | \ | 34 "$GIT_CL upload --no-oauth2 -t 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 '^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 | head -n 1 | grep -q '^test$'" |
47 [ $( egrep -q '^test$' --byte-offset) | grep '^0:' ] | |
48 | 47 |
49 test_expect_success "git-cl push ok" \ | 48 test_expect_success "git-cl land ok" \ |
50 "$GIT_CL push -f --no-oauth2" | 49 "$GIT_CL land --bypass-hooks" |
51 | 50 |
52 git checkout -q master > /dev/null 2>&1 | 51 git fetch origin |
53 git pull -q > /dev/null 2>&1 | 52 git checkout origin/master |
| 53 |
| 54 test_expect_success "committed code has proper summary" \ |
| 55 "[[ $(git log -n 1 --pretty=format:%s | egrep '^test$' -c) -eq 1 ]]" |
54 | 56 |
55 test_expect_success "committed code has proper description" \ | 57 test_expect_success "committed code has proper description" \ |
56 "git show | [ $( egrep -q '^branch work$' -c ) -eq 2 ] | 58 "[[ $(git log -n 1 --pretty=format:%b | egrep '^branch work$' -c) -eq 2 ]]
" |
57 | 59 |
58 test_expect_success "issue no longer has a branch" \ | 60 # # Have to sleep to let the server return the new status. |
59 "$GIT_CL_STATUS | grep -q 'work : None'" | 61 # sleep 5 |
| 62 # test_expect_success "branch issue is closed" \ |
| 63 # "$GIT_CL_STATUS | grep -q 'work :.*closed'" |
60 | 64 |
61 cd $GITREPO_PATH | |
62 test_expect_success "upstream repo has our commit" \ | |
63 "git log master 2>/dev/null | [ $( egrep -q '^branch work$' -c ) -eq 2 ] | |
64 ) | 65 ) |
65 SUCCESS=$? | 66 SUCCESS=$? |
66 | 67 |
67 cleanup | 68 cleanup |
68 | 69 |
69 if [ $SUCCESS == 0 ]; then | 70 if [ $SUCCESS == 0 ]; then |
70 echo PASS | 71 echo PASS |
71 fi | 72 fi |
OLD | NEW |