Bug 1319793 - [marionette harness tests] Default to not swallow stdout from pytest. r?whimboo
Added the flag 'capture --no' to the harness_unit tests. Stdout is now displayed by default.
MozReview-Commit-ID: HZj3vntLcKI
--- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_httpd.py
+++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_httpd.py
@@ -84,9 +84,9 @@ def test_handler(server):
url = server.get_url("/httpd/test_handler")
body = urllib2.urlopen(url).read()
res = json.loads(body)
assert res["count"] == counter
if __name__ == "__main__":
- mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-')
+ mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-', '--capture', 'no')
--- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_arguments.py
+++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_arguments.py
@@ -61,9 +61,9 @@ def test_parse_opt_args_emulator(mach_pa
mach_parsed_kwargs[arg_dest] = result[arg_dest]
mach_parsed_kwargs["emulator"] = True
runner = MarionetteTestRunner(**mach_parsed_kwargs)
built_kwargs = runner._build_kwargs()
assert built_kwargs[arg_dest] == expected_value
if __name__ == '__main__':
- mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-')
+ mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-', '--capture', 'no')
--- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_harness.py
+++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_harness.py
@@ -102,9 +102,9 @@ def test_harness_sets_up_default_test_ha
"""
harness = MarionetteHarness(args=mach_parsed_kwargs)
mach_parsed_kwargs.pop('tests')
runner = harness._runner_class(**mach_parsed_kwargs)
assert marionette_test.MarionetteTestCase in runner.test_handlers
if __name__ == '__main__':
- mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-')
+ mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-', '--capture', 'no')
--- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py
+++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py
@@ -502,9 +502,9 @@ def test_option_run_until_failure(mach_p
assert runner.run_until_failure == run_until_failure
if repeat is None:
assert runner.repeat == 30
else:
assert runner.repeat == repeat
if __name__ == '__main__':
- mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-')
+ mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-', '--capture', 'no')
--- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_test_result.py
+++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_test_result.py
@@ -48,9 +48,9 @@ def test_crash_is_recorded_as_error(empt
assert result.shouldStop == has_crashed
if has_crashed:
assert len(result.errors) == 1
else:
assert len(result.errors) == 0
if __name__ == '__main__':
- mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-')
+ mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-', '--capture', 'no')
--- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_serve.py
+++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_serve.py
@@ -61,9 +61,9 @@ def test_iter_url():
def test_where_is():
serve.start()
assert serve.where_is("/") == serve.servers["http"][1].get_url("/")
assert serve.where_is("/", on="https") == serve.servers["https"][1].get_url("/")
if __name__ == "__main__":
- mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-')
+ mozunit.main('-p', 'no:terminalreporter', '--log-tbpl=-', '--capture', 'no')