Commit 626e77d9 authored by stip@chromium.org's avatar stip@chromium.org

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
parent 7dc11449
...@@ -107,7 +107,7 @@ class LocalRietveld(object): ...@@ -107,7 +107,7 @@ class LocalRietveld(object):
self.install_prerequisites() self.install_prerequisites()
assert not self.tempdir assert not self.tempdir
self.tempdir = tempfile.mkdtemp(prefix='rietveld_test') 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) admin_port = find_free_port(self.port + 1)
if verbose: if verbose:
stdout = stderr = None stdout = stderr = None
......
...@@ -16,7 +16,7 @@ setup_gitsvn ...@@ -16,7 +16,7 @@ setup_gitsvn
( (
set -e set -e
cd git-svn cd git-svn
git config rietveld.server localhost:8080 git config rietveld.server localhost:10000
# Create a branch and give it an issue. # Create a branch and give it an issue.
git checkout -q -b abandoned git checkout -q -b abandoned
......
...@@ -23,7 +23,7 @@ setup_gitsvn ...@@ -23,7 +23,7 @@ setup_gitsvn
test_expect_success "git-cl upload wants a server" \ test_expect_success "git-cl upload wants a server" \
"$GIT_CL upload 2>&1 | grep -q 'You must configure'" "$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" \ test_expect_success "git-cl status has no issue" \
"$GIT_CL_STATUS | grep -q 'no issue'" "$GIT_CL_STATUS | grep -q 'no issue'"
......
...@@ -164,9 +164,9 @@ class GClientUtilsTest(trial_dir.TestCase): ...@@ -164,9 +164,9 @@ class GClientUtilsTest(trial_dir.TestCase):
['ssh-svn://foo/bar/', 'ssh-svn://foo/bar/'], ['ssh-svn://foo/bar/', 'ssh-svn://foo/bar/'],
['codereview.chromium.org', 'https://codereview.chromium.org'], ['codereview.chromium.org', 'https://codereview.chromium.org'],
['codereview.chromium.org/', 'https://codereview.chromium.org/'], ['codereview.chromium.org/', 'https://codereview.chromium.org/'],
['http://foo:8080', 'http://foo:8080'], ['http://foo:10000', 'http://foo:10000'],
['http://foo:8080/bar', 'http://foo:8080/bar'], ['http://foo:10000/bar', 'http://foo:10000/bar'],
['foo:8080', 'http://foo:8080'], ['foo:10000', 'http://foo:10000'],
['foo:', 'https://foo:'], ['foo:', 'https://foo:'],
] ]
for content, expected in values: for content, expected in values:
......
...@@ -15,7 +15,7 @@ setup_gitsvn ...@@ -15,7 +15,7 @@ setup_gitsvn
set -e set -e
cd git-svn cd git-svn
git config rietveld.server localhost:8080 git config rietveld.server localhost:10000
export GIT_EDITOR=$(which true) export GIT_EDITOR=$(which true)
git checkout -q -b work git checkout -q -b work
......
...@@ -18,7 +18,7 @@ setup_gitsvn ...@@ -18,7 +18,7 @@ setup_gitsvn
echo "some work done on a branch" >> test echo "some work done on a branch" >> test
git add test; git commit -q -m "branch work" 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. # Prevent the editor from coming up when you upload.
export GIT_EDITOR=$(which true) export GIT_EDITOR=$(which true)
......
...@@ -23,7 +23,7 @@ setup_gitgit ...@@ -23,7 +23,7 @@ setup_gitgit
test_expect_success "git-cl upload wants a server" \ test_expect_success "git-cl upload wants a server" \
"$GIT_CL upload 2>&1 | grep -q 'You must configure'" "$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" \ test_expect_success "git-cl status has no issue" \
"$GIT_CL_STATUS | grep -q 'no issue'" "$GIT_CL_STATUS | grep -q 'no issue'"
......
...@@ -23,7 +23,7 @@ setup_gitgit ...@@ -23,7 +23,7 @@ setup_gitgit
test_expect_success "git-cl upload wants a server" \ test_expect_success "git-cl upload wants a server" \
"$GIT_CL upload 2>&1 | grep -q 'You must configure'" "$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" \ test_expect_success "git-cl status has no issue" \
"$GIT_CL_STATUS | grep -q 'no issue'" "$GIT_CL_STATUS | grep -q 'no issue'"
......
...@@ -16,7 +16,7 @@ setup_gitsvn ...@@ -16,7 +16,7 @@ setup_gitsvn
( (
set -e set -e
cd git-svn cd git-svn
git config rietveld.server localhost:8080 git config rietveld.server localhost:10000
# Create a branch, rename a file, upload it. # Create a branch, rename a file, upload it.
git checkout -q -b rename git checkout -q -b rename
......
...@@ -18,7 +18,7 @@ setup_gitsvn ...@@ -18,7 +18,7 @@ setup_gitsvn
( (
set -e set -e
cd git-svn cd git-svn
git config rietveld.server localhost:8080 git config rietveld.server localhost:10000
# Create a branch and give it an issue. # Create a branch and give it an issue.
git checkout -q -b new git checkout -q -b new
......
...@@ -146,5 +146,5 @@ test_expect_failure() { ...@@ -146,5 +146,5 @@ test_expect_failure() {
print_xsrf_token() { print_xsrf_token() {
curl --cookie dev_appserver_login="test@example.com:False" \ curl --cookie dev_appserver_login="test@example.com:False" \
--header 'X-Requesting-XSRF-Token: 1' \ --header 'X-Requesting-XSRF-Token: 1' \
http://localhost:8080/xsrf_token 2>/dev/null http://localhost:10000/xsrf_token 2>/dev/null
} }
...@@ -19,7 +19,7 @@ setup_gitgit ...@@ -19,7 +19,7 @@ setup_gitgit
echo "some work done on a branch that tracks a local branch" >> test 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 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. # Prevent the editor from coming up when you upload.
export GIT_EDITOR=$(which true) export GIT_EDITOR=$(which true)
......
...@@ -18,7 +18,7 @@ setup_gitgit ...@@ -18,7 +18,7 @@ setup_gitgit
echo "some work done on a branch" >> test echo "some work done on a branch" >> test
git add test; git commit -q -m "branch work" 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. # Prevent the editor from coming up when you upload.
export GIT_EDITOR=$(which true) export GIT_EDITOR=$(which true)
......
...@@ -17,7 +17,7 @@ setup_gitsvn ...@@ -17,7 +17,7 @@ setup_gitsvn
set -e set -e
cd git-svn 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 for ref in refs/remotes/origin/trunk refs/remotes/origin/some_branch; do
git branch -f --set-upstream feature_branch $ref git branch -f --set-upstream feature_branch $ref
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment