diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 18:24:20 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 18:24:20 +0000 |
| commit | 111b1444f9e7f614566ba93b6329f3a4c980e3c5 (patch) | |
| tree | 094ffebce1db78d320bbe29a69e5598af44e014e /tools | |
| parent | a04a4a76880402222588272bbd0f97d6e6bcac11 (diff) | |
| download | chromium_src-111b1444f9e7f614566ba93b6329f3a4c980e3c5.zip chromium_src-111b1444f9e7f614566ba93b6329f3a4c980e3c5.tar.gz chromium_src-111b1444f9e7f614566ba93b6329f3a4c980e3c5.tar.bz2 | |
Fix --hash usage for run_test_from_archive.py.
posixpath.join('http://foo:123/baz', 'bar') seems to fail on the swarm slave,
I'm still not 100% sure why.
TBR=cmp@chromium.org
NOTRY=true
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10690172
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/isolate/run_test_from_archive.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/isolate/run_test_from_archive.py b/tools/isolate/run_test_from_archive.py index b227664..16c3306 100755 --- a/tools/isolate/run_test_from_archive.py +++ b/tools/isolate/run_test_from_archive.py @@ -13,7 +13,6 @@ import json import logging import optparse import os -import posixpath import re import shutil import stat @@ -451,13 +450,13 @@ def main(): if options.hash: # First calculate the reference to it. - options.manifest = posixpath.join(options.remote, options.hash) + options.manifest = '%s/%s' % (options.remote.rstrip('/'), options.hash) try: manifest = json.load(open_remote(options.manifest)) except IOError as e: parser.error( - 'Failed to read manifest %s; remote:%s; %s' % - (options.manifest, options.remote, str(e))) + 'Failed to read manifest %s; remote:%s; hash:%s; %s' % + (options.manifest, options.remote, options.hash, str(e))) return run_tha_test( manifest, os.path.abspath(options.cache), options.remote, |