| Index: native_client_sdk/src/tools/tests/chrome_mock.py
|
| diff --git a/native_client_sdk/src/tools/tests/chrome_mock.py b/native_client_sdk/src/tools/tests/chrome_mock.py
|
| index cd20e88ac1f28e370d3e00aa9518308440178b23..966e2310ad70444284b603d25baf3e565f153421 100755
|
| --- a/native_client_sdk/src/tools/tests/chrome_mock.py
|
| +++ b/native_client_sdk/src/tools/tests/chrome_mock.py
|
| @@ -3,37 +3,39 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -import optparse
|
| +"""Mock chrome process used by test code for http server."""
|
| +
|
| +import argparse
|
| import sys
|
| import time
|
| import urllib2
|
|
|
| def PrintAndFlush(s):
|
| - print s
|
| + sys.stdout.write(s + '\n')
|
| sys.stdout.flush()
|
|
|
| def main(args):
|
| - parser = optparse.OptionParser(usage='%prog [options] <URL to load>')
|
| - parser.add_option('--post', help='POST to URL.', dest='post',
|
| - action='store_true')
|
| - parser.add_option('--get', help='GET to URL.', dest='get',
|
| - action='store_true')
|
| - parser.add_option('--sleep',
|
| - help='Number of seconds to sleep after reading URL',
|
| - dest='sleep', default=0)
|
| - parser.add_option('--expect-to-be-killed', help='If set, the script will warn'
|
| - ' if it isn\'t killed before it finishes sleeping.',
|
| - dest='expect_to_be_killed', action='store_true')
|
| - options, args = parser.parse_args(args)
|
| - if len(args) != 1:
|
| - parser.error('Expected URL to load.')
|
| + parser = argparse.ArgumentParser(description=__doc__)
|
| + parser.add_argument('--post', help='POST to URL.', dest='post',
|
| + action='store_true')
|
| + parser.add_argument('--get', help='GET to URL.', dest='get',
|
| + action='store_true')
|
| + parser.add_argument('--sleep',
|
| + help='Number of seconds to sleep after reading URL',
|
| + dest='sleep', default=0)
|
| + parser.add_argument('--expect-to-be-killed', help='If set, the script will'
|
| + ' warn if it isn\'t killed before it finishes sleeping.',
|
| + dest='expect_to_be_killed', action='store_true')
|
| + parser.add_argument('url')
|
| +
|
| + options = parser.parse_args(args)
|
|
|
| PrintAndFlush('Starting %s.' % sys.argv[0])
|
|
|
| if options.post:
|
| - urllib2.urlopen(args[0], data='').read()
|
| + urllib2.urlopen(options.url, data='').read()
|
| elif options.get:
|
| - urllib2.urlopen(args[0]).read()
|
| + urllib2.urlopen(options.url).read()
|
| else:
|
| # Do nothing but wait to be killed.
|
| pass
|
| @@ -42,7 +44,7 @@ def main(args):
|
|
|
| if options.expect_to_be_killed:
|
| PrintAndFlush('Done sleeping. Expected to be killed.')
|
| - sys.exit(0)
|
| + return 0
|
|
|
| if __name__ == '__main__':
|
| sys.exit(main(sys.argv[1:]))
|
|
|