| 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_initsvn | 11 setup_git_remote |
| 12 setup_gitsvn | 12 setup_git_checkout |
| 13 | 13 |
| 14 ( | 14 ( |
| 15 set -e | 15 set -e |
| 16 cd git-svn | 16 cd git_checkout |
| 17 git checkout -q -b work | 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 --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 assigned'" | 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 |
| 40 # Push a description to this URL. | 40 # Push a description to this URL. |
| 41 URL=$($GIT_CL_STATUS | sed -ne '/Issue number/s/[^(]*(\(.*\))/\1/p') | 41 URL=$($GIT_CL_STATUS | sed -ne '/Issue number/s/[^(]*(\(.*\))/\1/p') |
| 42 curl --cookie dev_appserver_login="test@example.com:False" \ | 42 curl --cookie dev_appserver_login="test@example.com:False" \ |
| 43 --data-urlencode subject="test" \ | 43 --data-urlencode subject="test" \ |
| 44 --data-urlencode description="foo-quux" \ | 44 --data-urlencode description="foo-quux" \ |
| 45 --data-urlencode xsrf_token="$(print_xsrf_token)" \ | 45 --data-urlencode xsrf_token="$(print_xsrf_token)" \ |
| 46 $URL/edit | 46 $URL/edit |
| 47 | 47 |
| 48 test_expect_success "git-cl dcommits ok" \ | 48 test_expect_success "git-cl land ok" \ |
| 49 "$GIT_CL dcommit -f --no-oauth2" | 49 "$GIT_CL land -f --no-oauth2" |
| 50 | 50 |
| 51 test_expect_success "branch still has an issue" \ | 51 test_expect_success "branch still has an issue" \ |
| 52 "$GIT_CL_STATUS | grep -q 'Issue number'" | 52 "$GIT_CL_STATUS | grep -q 'Issue number'" |
| 53 | 53 |
| 54 git checkout -q master | 54 git checkout -q master > /dev/null 2>&1 |
| 55 git svn -q rebase >/dev/null 2>&1 | 55 git pull -q > /dev/null 2>&1 |
| 56 test_expect_success "dcommitted code has proper description" \ | 56 |
| 57 test_expect_success "committed code has proper description" \ |
| 57 "git show | grep -q 'foo-quux'" | 58 "git show | grep -q 'foo-quux'" |
| 58 | 59 |
| 59 test_expect_success "upstream svn has our commit" \ | 60 cd $GITREPO_PATH |
| 60 "svn log $REPO_URL 2>/dev/null | grep -q 'foo-quux'" | 61 test_expect_success "upstream repo has our commit" \ |
| 62 "git log master 2>/dev/null | grep -q 'foo-quux'" |
| 61 ) | 63 ) |
| 62 SUCCESS=$? | 64 SUCCESS=$? |
| 63 | 65 |
| 64 cleanup | 66 cleanup |
| 65 | 67 |
| 66 if [ $SUCCESS == 0 ]; then | 68 if [ $SUCCESS == 0 ]; then |
| 67 echo PASS | 69 echo PASS |
| 68 fi | 70 fi |
| OLD | NEW |