From 2295005511e833151115342fefb691011705c8fb Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 24 Mar 2011 23:07:46 +0000 Subject: [PATCH] Make sure the GAE SDK don't look for SDK updates while running presubmit checks Otherwise the local Rietveld instance could mysteriously hang. TEST=presubmit check won't fail even if an old version of the SDK is used BUG=none Review URL: http://codereview.chromium.org/6652002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@79338 0039d316-1c4b-4281-b951-d872f2087c98 --- git_cl/test/local_rietveld.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/git_cl/test/local_rietveld.py b/git_cl/test/local_rietveld.py index 88071c467f..7649669a18 100644 --- a/git_cl/test/local_rietveld.py +++ b/git_cl/test/local_rietveld.py @@ -102,10 +102,16 @@ class LocalRietveld(object): self.out = open(os.devnull, 'w') self.err = open(os.devnull, 'w') output = [] + cmd = [ + self.dev_app, + '--skip_sdk_update_check', + '.', + '--port=%d' % self.port, + '--datastore_path=' + os.path.join(self.rietveld, 'tmp.db'), + '-c'] self.test_server = subprocess.Popen( - [self.dev_app, self.rietveld, '--port=%d' % self.port, - '--datastore_path=' + os.path.join(self.rietveld, 'tmp.db'), '-c'], - stdout=self.out, stderr=self.err, env=self.env) + cmd, stdout=self.out, stderr=self.err, env=self.env, + cwd=self.rietveld) # Loop until port 127.0.0.1:port opens or the process dies. while not test_port(self.port): self.test_server.poll()