Skip to content

Commit 9f59fce

Browse files
committed
Set default reactor for tests
1 parent 7c76051 commit 9f59fce

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

testing/test_basic.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,17 @@ def format_run_result_output_for_assert(run_result):
3232

3333

3434
def skip_if_reactor_not(expected_reactor):
35-
actual_reactor = pytest.config.getoption('reactor')
35+
actual_reactor = pytest.config.getoption('reactor', 'default')
3636
return pytest.mark.skipif(
3737
actual_reactor != expected_reactor,
38-
reason='reactor is {} not {}'.format(
39-
actual_reactor,
40-
expected_reactor,
41-
),
38+
reason='reactor is {} not {}'.format(actual_reactor, expected_reactor)
4239
)
4340

4441

4542
@pytest.fixture
4643
def cmd_opts(request):
47-
return '--reactor={}'.format(request.config.getoption('reactor')),
44+
reactor = request.config.getoption('reactor', 'default')
45+
return '--reactor={}'.format(reactor),
4846

4947

5048
def test_fail_later(testdir, cmd_opts):
@@ -166,7 +164,6 @@ def test_succeed(foo):
166164
raise RuntimeError("baz")
167165
""")
168166
rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
169-
# assert not rr
170167
assert_outcomes(rr, {'passed': 2, 'failed': 1})
171168

172169

@@ -252,7 +249,6 @@ def test_succeed():
252249
""")
253250
rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
254251
assert 'WrongReactorAlreadyInstalledError' in rr.stderr.str()
255-
# assert_outcomes(rr, {'error': 1})
256252

257253

258254
@skip_if_reactor_not('default')

0 commit comments

Comments
 (0)