This is an archive of the discontinued Mercurial Phabricator instance.

Differential D293

tests: fix simple heredoc print statements to work on Py3
ClosedPublic

Authored by durin42 on Aug 9 2017, 10:24 AM.

Details

Reviewers
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHG27fb986e54d0: tests: fix simple heredoc print statements to work on Py3
Summary

There are a handful left that require some more care.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 688

tests/test-hgweb-no-path-info.t

> util, > util,
> ) > )
> stringio = util.stringio > stringio = util.stringio
> >
> errors = stringio() > errors = stringio()
> input = stringio() > input = stringio()
> >
> def startrsp(status, headers): > def startrsp(status, headers):
> print '---- STATUS' > print('---- STATUS')
> print status > print(status)
> print '---- HEADERS' > print('---- HEADERS')
> print [i for i in headers if i[0] != 'ETag'] > print([i for i in headers if i[0] != 'ETag'])
> print '---- DATA' > print('---- DATA')
> return output.write > return output.write
> >
> env = { > env = {
> 'wsgi.version': (1, 0), > 'wsgi.version': (1, 0),
> 'wsgi.url_scheme': 'http', > 'wsgi.url_scheme': 'http',
> 'wsgi.errors': errors, > 'wsgi.errors': errors,
> 'wsgi.input': input, > 'wsgi.input': input,
> 'wsgi.multithread': False, > 'wsgi.multithread': False,
> 'wsgi.multiprocess': False, > 'wsgi.multiprocess': False,
> 'wsgi.run_once': False, > 'wsgi.run_once': False,
> 'REQUEST_METHOD': 'GET', > 'REQUEST_METHOD': 'GET',
> 'PATH_INFO': '/', > 'PATH_INFO': '/',
> 'SCRIPT_NAME': '', > 'SCRIPT_NAME': '',
> 'SERVER_NAME': '$LOCALIP', > 'SERVER_NAME': '$LOCALIP',
> 'SERVER_PORT': os.environ['HGPORT'], > 'SERVER_PORT': os.environ['HGPORT'],
> 'SERVER_PROTOCOL': 'HTTP/1.0' > 'SERVER_PROTOCOL': 'HTTP/1.0'
> } > }
> >
> def process(app): > def process(app):
> content = app(env, startrsp) > content = app(env, startrsp)
> sys.stdout.write(output.getvalue()) > sys.stdout.write(output.getvalue())
> sys.stdout.write(''.join(content)) > sys.stdout.write(''.join(content))
> getattr(content, 'close', lambda : None)() > getattr(content, 'close', lambda : None)()
> print '---- ERRORS' > print('---- ERRORS')
> print errors.getvalue() > print(errors.getvalue())
> >
> output = stringio() > output = stringio()
> env['QUERY_STRING'] = 'style=atom' > env['QUERY_STRING'] = 'style=atom'
> process(hgweb('.', name='repo')) > process(hgweb('.', name='repo'))
> >
> output = stringio() > output = stringio()
> env['QUERY_STRING'] = 'style=raw' > env['QUERY_STRING'] = 'style=raw'
> process(hgwebdir({'repo': '.'})) > process(hgwebdir({'repo': '.'}))

tests/test-hgweb-no-request-uri.t

> util, > util,
> ) > )
> stringio = util.stringio > stringio = util.stringio
> >
> errors = stringio() > errors = stringio()
> input = stringio() > input = stringio()
> >
> def startrsp(status, headers): > def startrsp(status, headers):
> print '---- STATUS' > print('---- STATUS')
> print status > print(status)
> print '---- HEADERS' > print('---- HEADERS')
> print [i for i in headers if i[0] != 'ETag'] > print([i for i in headers if i[0] != 'ETag'])
> print '---- DATA' > print('---- DATA')
> return output.write > return output.write
> >
> env = { > env = {
> 'wsgi.version': (1, 0), > 'wsgi.version': (1, 0),
> 'wsgi.url_scheme': 'http', > 'wsgi.url_scheme': 'http',
> 'wsgi.errors': errors, > 'wsgi.errors': errors,
> 'wsgi.input': input, > 'wsgi.input': input,
> 'wsgi.multithread': False, > 'wsgi.multithread': False,
> 'wsgi.multiprocess': False, > 'wsgi.multiprocess': False,
> 'wsgi.run_once': False, > 'wsgi.run_once': False,
> 'REQUEST_METHOD': 'GET', > 'REQUEST_METHOD': 'GET',
> 'SCRIPT_NAME': '', > 'SCRIPT_NAME': '',
> 'SERVER_NAME': '$LOCALIP', > 'SERVER_NAME': '$LOCALIP',
> 'SERVER_PORT': os.environ['HGPORT'], > 'SERVER_PORT': os.environ['HGPORT'],
> 'SERVER_PROTOCOL': 'HTTP/1.0' > 'SERVER_PROTOCOL': 'HTTP/1.0'
> } > }
> >
> def process(app): > def process(app):
> content = app(env, startrsp) > content = app(env, startrsp)
> sys.stdout.write(output.getvalue()) > sys.stdout.write(output.getvalue())
> sys.stdout.write(''.join(content)) > sys.stdout.write(''.join(content))
> getattr(content, 'close', lambda : None)() > getattr(content, 'close', lambda : None)()
> print '---- ERRORS' > print('---- ERRORS')
> print errors.getvalue() > print(errors.getvalue())
> >
> output = stringio() > output = stringio()
> env['PATH_INFO'] = '/' > env['PATH_INFO'] = '/'
> env['QUERY_STRING'] = 'style=atom' > env['QUERY_STRING'] = 'style=atom'
> process(hgweb('.', name = 'repo')) > process(hgweb('.', name = 'repo'))
> >
> output = stringio() > output = stringio()
> env['PATH_INFO'] = '/file/tip/' > env['PATH_INFO'] = '/file/tip/'

tests/test-hgweb-non-interactive.t

> return self.real.readline() > return self.real.readline()
> >
> sys.stdin = FileLike(sys.stdin) > sys.stdin = FileLike(sys.stdin)
> errors = stringio() > errors = stringio()
> input = stringio() > input = stringio()
> output = stringio() > output = stringio()
> >
> def startrsp(status, headers): > def startrsp(status, headers):
> print '---- STATUS' > print('---- STATUS')
> print status > print(status)
> print '---- HEADERS' > print('---- HEADERS')
> print [i for i in headers if i[0] != 'ETag'] > print([i for i in headers if i[0] != 'ETag'])
> print '---- DATA' > print('---- DATA')
> return output.write > return output.write
> >
> env = { > env = {
> 'wsgi.version': (1, 0), > 'wsgi.version': (1, 0),
> 'wsgi.url_scheme': 'http', > 'wsgi.url_scheme': 'http',
> 'wsgi.errors': errors, > 'wsgi.errors': errors,
> 'wsgi.input': input, > 'wsgi.input': input,
> 'wsgi.multithread': False, > 'wsgi.multithread': False,
> 'wsgi.multiprocess': False, > 'wsgi.multiprocess': False,
> 'wsgi.run_once': False, > 'wsgi.run_once': False,
> 'REQUEST_METHOD': 'GET', > 'REQUEST_METHOD': 'GET',
> 'SCRIPT_NAME': '', > 'SCRIPT_NAME': '',
> 'PATH_INFO': '', > 'PATH_INFO': '',
> 'QUERY_STRING': '', > 'QUERY_STRING': '',
> 'SERVER_NAME': '$LOCALIP', > 'SERVER_NAME': '$LOCALIP',
> 'SERVER_PORT': os.environ['HGPORT'], > 'SERVER_PORT': os.environ['HGPORT'],
> 'SERVER_PROTOCOL': 'HTTP/1.0' > 'SERVER_PROTOCOL': 'HTTP/1.0'
> } > }
> >
> i = hgweb('.') > i = hgweb('.')
> for c in i(env, startrsp): > for c in i(env, startrsp):
> pass > pass
> print '---- ERRORS' > print('---- ERRORS')
> print errors.getvalue() > print(errors.getvalue())
> print '---- OS.ENVIRON wsgi variables' > print('---- OS.ENVIRON wsgi variables')
> print sorted([x for x in os.environ if x.startswith('wsgi')]) > print(sorted([x for x in os.environ if x.startswith('wsgi')]))
> print '---- request.ENVIRON wsgi variables' > print('---- request.ENVIRON wsgi variables')
> with i._obtainrepo() as repo: > with i._obtainrepo() as repo:
> print sorted([x for x in repo.ui.environ if x.startswith('wsgi')]) > print(sorted([x for x in repo.ui.environ if x.startswith('wsgi')]))
> EOF > EOF
$ $PYTHON request.py $ $PYTHON request.py
---- STATUS ---- STATUS
200 Script output follows 200 Script output follows
---- HEADERS ---- HEADERS
[('Content-Type', 'text/html; charset=ascii')] [('Content-Type', 'text/html; charset=ascii')]
---- DATA ---- DATA
---- ERRORS ---- ERRORS
---- OS.ENVIRON wsgi variables ---- OS.ENVIRON wsgi variables
[] []
---- request.ENVIRON wsgi variables ---- request.ENVIRON wsgi variables
['wsgi.errors', 'wsgi.input', 'wsgi.multiprocess', 'wsgi.multithread', 'wsgi.run_once', 'wsgi.url_scheme', 'wsgi.version'] ['wsgi.errors', 'wsgi.input', 'wsgi.multiprocess', 'wsgi.multithread', 'wsgi.run_once', 'wsgi.url_scheme', 'wsgi.version']
$ cd .. $ cd ..

tests/test-repair-strip.t

#require unix-permissions no-root #require unix-permissions no-root
$ cat > $TESTTMP/dumpjournal.py <<EOF $ cat > $TESTTMP/dumpjournal.py <<EOF
> import sys > import sys
> for entry in sys.stdin.read().split('\n'): > for entry in sys.stdin.read().split('\n'):
> if entry: > if entry:
> print entry.split('\x00')[0] > print(entry.split('\x00')[0])
> EOF > EOF
$ echo "[extensions]" >> $HGRCPATH $ echo "[extensions]" >> $HGRCPATH
$ echo "mq=">> $HGRCPATH $ echo "mq=">> $HGRCPATH
$ teststrip() { $ teststrip() {
> hg -q up -C $1 > hg -q up -C $1
> echo % before update $1, strip $2 > echo % before update $1, strip $2