From e7444bbd5e04ec753cc29343f4705cb6c097f72a Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 23 Jan 2020 11:35:35 +0100 Subject: [PATCH] tests: remove unnecessary `-rw` option Warnings are enabled by default, which is tested by `test_getreportopt`. --- testing/python/collect.py | 10 +++++----- testing/test_assertion.py | 2 +- testing/test_cacheprovider.py | 2 +- testing/test_junitxml.py | 8 ++++---- testing/test_pluginmanager.py | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testing/python/collect.py b/testing/python/collect.py index 6e9938227..f38c309b2 100644 --- a/testing/python/collect.py +++ b/testing/python/collect.py @@ -68,7 +68,7 @@ class TestModule: def test_invalid_test_module_name(self, testdir): a = testdir.mkdir("a") a.ensure("test_one.part1.py") - result = testdir.runpytest("-rw") + result = testdir.runpytest() result.stdout.fnmatch_lines( [ "ImportError while importing test module*test_one.part1*", @@ -137,7 +137,7 @@ class TestClass: pass """ ) - result = testdir.runpytest("-rw") + result = testdir.runpytest() result.stdout.fnmatch_lines( [ "*cannot collect test class 'TestClass1' because it has " @@ -153,7 +153,7 @@ class TestClass: pass """ ) - result = testdir.runpytest("-rw") + result = testdir.runpytest() result.stdout.fnmatch_lines( [ "*cannot collect test class 'TestClass1' because it has " @@ -230,7 +230,7 @@ class TestClass: TestCase = collections.namedtuple('TestCase', ['a']) """ ) - result = testdir.runpytest("-rw") + result = testdir.runpytest() result.stdout.fnmatch_lines( "*cannot collect test class 'TestCase' " "because it has a __new__ constructor*" @@ -1162,7 +1162,7 @@ def test_dont_collect_non_function_callable(testdir): pass """ ) - result = testdir.runpytest("-rw") + result = testdir.runpytest() result.stdout.fnmatch_lines( [ "*collected 1 item*", diff --git a/testing/test_assertion.py b/testing/test_assertion.py index 5c0425829..e975a3fea 100644 --- a/testing/test_assertion.py +++ b/testing/test_assertion.py @@ -1349,7 +1349,7 @@ def test_assert_indirect_tuple_no_warning(testdir): assert tpl """ ) - result = testdir.runpytest("-rw") + result = testdir.runpytest() output = "\n".join(result.stdout.lines) assert "WR1" not in output diff --git a/testing/test_cacheprovider.py b/testing/test_cacheprovider.py index e22c1c766..b74be5a73 100644 --- a/testing/test_cacheprovider.py +++ b/testing/test_cacheprovider.py @@ -66,7 +66,7 @@ class TestNewAPI: testdir.tmpdir.ensure_dir(".pytest_cache").chmod(0) try: testdir.makepyfile("def test_error(): raise Exception") - result = testdir.runpytest("-rw") + result = testdir.runpytest() assert result.ret == 1 # warnings from nodeids, lastfailed, and stepwise result.stdout.fnmatch_lines( diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py index f6d90852f..365332d70 100644 --- a/testing/test_junitxml.py +++ b/testing/test_junitxml.py @@ -1061,7 +1061,7 @@ def test_record_property(testdir, run_and_parse): record_property("foo", "<1"); """ ) - result, dom = run_and_parse("-rw") + result, dom = run_and_parse() node = dom.find_first_by_tag("testsuite") tnode = node.find_first_by_tag("testcase") psnode = tnode.find_first_by_tag("properties") @@ -1079,7 +1079,7 @@ def test_record_property_same_name(testdir, run_and_parse): record_property("foo", "baz") """ ) - result, dom = run_and_parse("-rw") + result, dom = run_and_parse() node = dom.find_first_by_tag("testsuite") tnode = node.find_first_by_tag("testcase") psnode = tnode.find_first_by_tag("properties") @@ -1121,7 +1121,7 @@ def test_record_attribute(testdir, run_and_parse): record_xml_attribute("foo", "<1"); """ ) - result, dom = run_and_parse("-rw") + result, dom = run_and_parse() node = dom.find_first_by_tag("testsuite") tnode = node.find_first_by_tag("testcase") tnode.assert_attr(bar="1") @@ -1156,7 +1156,7 @@ def test_record_fixtures_xunit2(testdir, fixture_name, run_and_parse): ) ) - result, dom = run_and_parse("-rw", family=None) + result, dom = run_and_parse(family=None) expected_lines = [] if fixture_name == "record_xml_attribute": expected_lines.append( diff --git a/testing/test_pluginmanager.py b/testing/test_pluginmanager.py index e3402d207..5ddb3e41a 100644 --- a/testing/test_pluginmanager.py +++ b/testing/test_pluginmanager.py @@ -256,7 +256,7 @@ class TestPytestPluginManager: ) p.copy(p.dirpath("skipping2.py")) monkeypatch.setenv("PYTEST_PLUGINS", "skipping2") - result = testdir.runpytest("-rw", "-p", "skipping1", syspathinsert=True) + result = testdir.runpytest("-p", "skipping1", syspathinsert=True) assert result.ret == ExitCode.NO_TESTS_COLLECTED result.stdout.fnmatch_lines( ["*skipped plugin*skipping1*hello*", "*skipped plugin*skipping2*hello*"]