From 626e77d9d3a6923972d06fdba741dd62e343583d Mon Sep 17 00:00:00 2001 From: "stip@chromium.org" Date: Thu, 13 Mar 2014 01:05:58 +0000 Subject: [PATCH] Make rietveld test work on port 10000. depot_tools PRESUBMIT.py and tools/build PRESUBMIT.py both run on cq.golo. If broken dev_appserver.py instances are left around, they will conflict with master ports. BUG=351926 Review URL: https://codereview.chromium.org/197073007 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256721 0039d316-1c4b-4281-b951-d872f2087c98 --- testing_support/local_rietveld.py | 2 +- tests/abandon.sh | 2 +- tests/basic.sh | 2 +- tests/gclient_utils_test.py | 6 +++--- tests/owners.sh | 2 +- tests/patch.sh | 2 +- tests/push-basic.sh | 2 +- tests/push-from-logs.sh | 2 +- tests/rename.sh | 2 +- tests/submit-from-new-dir.sh | 2 +- tests/test-lib.sh | 2 +- tests/upload-local-tracking-branch.sh | 2 +- tests/upload-stale.sh | 2 +- tests/upstream.sh | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/testing_support/local_rietveld.py b/testing_support/local_rietveld.py index 38b1a5a3c..d394913e7 100755 --- a/testing_support/local_rietveld.py +++ b/testing_support/local_rietveld.py @@ -107,7 +107,7 @@ class LocalRietveld(object): self.install_prerequisites() assert not self.tempdir self.tempdir = tempfile.mkdtemp(prefix='rietveld_test') - self.port = find_free_port(8080) + self.port = find_free_port(10000) admin_port = find_free_port(self.port + 1) if verbose: stdout = stderr = None diff --git a/tests/abandon.sh b/tests/abandon.sh index 93afd62a4..ab33751a6 100755 --- a/tests/abandon.sh +++ b/tests/abandon.sh @@ -16,7 +16,7 @@ setup_gitsvn ( set -e cd git-svn - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 # Create a branch and give it an issue. git checkout -q -b abandoned diff --git a/tests/basic.sh b/tests/basic.sh index aeac0f135..e8b3682bb 100755 --- a/tests/basic.sh +++ b/tests/basic.sh @@ -23,7 +23,7 @@ setup_gitsvn test_expect_success "git-cl upload wants a server" \ "$GIT_CL upload 2>&1 | grep -q 'You must configure'" - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 test_expect_success "git-cl status has no issue" \ "$GIT_CL_STATUS | grep -q 'no issue'" diff --git a/tests/gclient_utils_test.py b/tests/gclient_utils_test.py index 11325c441..e8e667918 100755 --- a/tests/gclient_utils_test.py +++ b/tests/gclient_utils_test.py @@ -164,9 +164,9 @@ class GClientUtilsTest(trial_dir.TestCase): ['ssh-svn://foo/bar/', 'ssh-svn://foo/bar/'], ['codereview.chromium.org', 'https://codereview.chromium.org'], ['codereview.chromium.org/', 'https://codereview.chromium.org/'], - ['http://foo:8080', 'http://foo:8080'], - ['http://foo:8080/bar', 'http://foo:8080/bar'], - ['foo:8080', 'http://foo:8080'], + ['http://foo:10000', 'http://foo:10000'], + ['http://foo:10000/bar', 'http://foo:10000/bar'], + ['foo:10000', 'http://foo:10000'], ['foo:', 'https://foo:'], ] for content, expected in values: diff --git a/tests/owners.sh b/tests/owners.sh index 70f76a1a9..28dd7c97d 100755 --- a/tests/owners.sh +++ b/tests/owners.sh @@ -15,7 +15,7 @@ setup_gitsvn set -e cd git-svn - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 export GIT_EDITOR=$(which true) git checkout -q -b work diff --git a/tests/patch.sh b/tests/patch.sh index 038e4d5c8..d9c66120b 100755 --- a/tests/patch.sh +++ b/tests/patch.sh @@ -18,7 +18,7 @@ setup_gitsvn echo "some work done on a branch" >> test git add test; git commit -q -m "branch work" - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 # Prevent the editor from coming up when you upload. export GIT_EDITOR=$(which true) diff --git a/tests/push-basic.sh b/tests/push-basic.sh index 1f9cb275c..f84cdeca7 100755 --- a/tests/push-basic.sh +++ b/tests/push-basic.sh @@ -23,7 +23,7 @@ setup_gitgit test_expect_success "git-cl upload wants a server" \ "$GIT_CL upload 2>&1 | grep -q 'You must configure'" - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 test_expect_success "git-cl status has no issue" \ "$GIT_CL_STATUS | grep -q 'no issue'" diff --git a/tests/push-from-logs.sh b/tests/push-from-logs.sh index 67cc2dc9a..a81c51383 100755 --- a/tests/push-from-logs.sh +++ b/tests/push-from-logs.sh @@ -23,7 +23,7 @@ setup_gitgit test_expect_success "git-cl upload wants a server" \ "$GIT_CL upload 2>&1 | grep -q 'You must configure'" - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 test_expect_success "git-cl status has no issue" \ "$GIT_CL_STATUS | grep -q 'no issue'" diff --git a/tests/rename.sh b/tests/rename.sh index 4aafd1088..03635a25e 100755 --- a/tests/rename.sh +++ b/tests/rename.sh @@ -16,7 +16,7 @@ setup_gitsvn ( set -e cd git-svn - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 # Create a branch, rename a file, upload it. git checkout -q -b rename diff --git a/tests/submit-from-new-dir.sh b/tests/submit-from-new-dir.sh index fe2546510..ec9f4d526 100755 --- a/tests/submit-from-new-dir.sh +++ b/tests/submit-from-new-dir.sh @@ -18,7 +18,7 @@ setup_gitsvn ( set -e cd git-svn - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 # Create a branch and give it an issue. git checkout -q -b new diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 92ec3bbdd..46d34de36 100755 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -146,5 +146,5 @@ test_expect_failure() { print_xsrf_token() { curl --cookie dev_appserver_login="test@example.com:False" \ --header 'X-Requesting-XSRF-Token: 1' \ - http://localhost:8080/xsrf_token 2>/dev/null + http://localhost:10000/xsrf_token 2>/dev/null } diff --git a/tests/upload-local-tracking-branch.sh b/tests/upload-local-tracking-branch.sh index b94ba2be6..b7602d328 100755 --- a/tests/upload-local-tracking-branch.sh +++ b/tests/upload-local-tracking-branch.sh @@ -19,7 +19,7 @@ setup_gitgit echo "some work done on a branch that tracks a local branch" >> test git add test; git commit -q -m "local tracking branch work" - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 # Prevent the editor from coming up when you upload. export GIT_EDITOR=$(which true) diff --git a/tests/upload-stale.sh b/tests/upload-stale.sh index 6fc8197bf..ddc57cc96 100755 --- a/tests/upload-stale.sh +++ b/tests/upload-stale.sh @@ -18,7 +18,7 @@ setup_gitgit echo "some work done on a branch" >> test git add test; git commit -q -m "branch work" - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 # Prevent the editor from coming up when you upload. export GIT_EDITOR=$(which true) diff --git a/tests/upstream.sh b/tests/upstream.sh index b264b3e94..b3ff0acee 100755 --- a/tests/upstream.sh +++ b/tests/upstream.sh @@ -17,7 +17,7 @@ setup_gitsvn set -e cd git-svn - git config rietveld.server localhost:8080 + git config rietveld.server localhost:10000 for ref in refs/remotes/origin/trunk refs/remotes/origin/some_branch; do git branch -f --set-upstream feature_branch $ref