diff options
author | Bruno Oliveira <nicoddemus@gmail.com> | 2018-05-25 18:21:48 -0300 |
---|---|---|
committer | Bruno Oliveira <nicoddemus@gmail.com> | 2018-05-25 18:21:48 -0300 |
commit | 1b16d649f9c43573111af19d29f34fa7330aff88 (patch) | |
tree | b1d145ee3de5fb83ecd05cd67c72867575e22105 /testing/test_unittest.py | |
parent | 6f8547cc1a516a1615bb33fcc4c9fc0fc7196731 (diff) | |
download | pytest-1b16d649f9c43573111af19d29f34fa7330aff88.tar.gz |
Fix formatting of merged files
Diffstat (limited to 'testing/test_unittest.py')
-rw-r--r-- | testing/test_unittest.py | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/testing/test_unittest.py b/testing/test_unittest.py index f5728c781..65ffdb975 100644 --- a/testing/test_unittest.py +++ b/testing/test_unittest.py @@ -928,15 +928,14 @@ def test_class_method_containing_test_issue1558(testdir): @pytest.mark.issue(3498) -@pytest.mark.parametrize("base", [ - 'six.moves.builtins.object', - 'unittest.TestCase', - 'unittest2.TestCase', -]) +@pytest.mark.parametrize( + "base", ["six.moves.builtins.object", "unittest.TestCase", "unittest2.TestCase"] +) def test_usefixtures_marker_on_unittest(base, testdir): - module = base.rsplit('.', 1)[0] + module = base.rsplit(".", 1)[0] pytest.importorskip(module) - testdir.makepyfile(conftest=""" + testdir.makepyfile( + conftest=""" import pytest @pytest.fixture(scope='function') @@ -961,9 +960,11 @@ def test_usefixtures_marker_on_unittest(base, testdir): for item in items: node_and_marks(item) - """) + """ + ) - testdir.makepyfile(""" + testdir.makepyfile( + """ import pytest import {module} @@ -982,7 +983,10 @@ def test_usefixtures_marker_on_unittest(base, testdir): assert self.fixture2 - """.format(module=module, base=base)) + """.format( + module=module, base=base + ) + ) - result = testdir.runpytest('-s') + result = testdir.runpytest("-s") result.assert_outcomes(passed=2) |