Skip to content

Commit 2fc6767

Browse files
Marco Gorelliasottile
authored andcommitted
Remove unnecessary fixtures in signatures from pygrep tests
1 parent ee1fcfb commit 2fc6767

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

tests/languages/pygrep_test.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,42 +23,47 @@ def some_files(tmpdir):
2323
("h'q", 1, "f3:1:with'quotes\n"),
2424
),
2525
)
26-
def test_main(some_files, cap_out, pattern, expected_retcode, expected_out):
26+
def test_main(cap_out, pattern, expected_retcode, expected_out):
2727
ret = pygrep.main((pattern, 'f1', 'f2', 'f3'))
2828
out = cap_out.get()
2929
assert ret == expected_retcode
3030
assert out == expected_out
3131

3232

33-
def test_ignore_case(some_files, cap_out):
33+
@pytest.mark.usefixtures('some_files')
34+
def test_ignore_case(cap_out):
3435
ret = pygrep.main(('--ignore-case', 'info', 'f1', 'f2', 'f3'))
3536
out = cap_out.get()
3637
assert ret == 1
3738
assert out == 'f2:1:[INFO] hi\n'
3839

3940

40-
def test_multiline(some_files, cap_out):
41+
@pytest.mark.usefixtures('some_files')
42+
def test_multiline(cap_out):
4143
ret = pygrep.main(('--multiline', r'foo\nbar', 'f1', 'f2', 'f3'))
4244
out = cap_out.get()
4345
assert ret == 1
4446
assert out == 'f1:1:foo\nbar\n'
4547

4648

47-
def test_multiline_line_number(some_files, cap_out):
49+
@pytest.mark.usefixtures('some_files')
50+
def test_multiline_line_number(cap_out):
4851
ret = pygrep.main(('--multiline', r'ar', 'f1', 'f2', 'f3'))
4952
out = cap_out.get()
5053
assert ret == 1
5154
assert out == 'f1:2:bar\n'
5255

5356

54-
def test_multiline_dotall_flag_is_enabled(some_files, cap_out):
57+
@pytest.mark.usefixtures('some_files')
58+
def test_multiline_dotall_flag_is_enabled(cap_out):
5559
ret = pygrep.main(('--multiline', r'o.*bar', 'f1', 'f2', 'f3'))
5660
out = cap_out.get()
5761
assert ret == 1
5862
assert out == 'f1:1:foo\nbar\n'
5963

6064

61-
def test_multiline_multiline_flag_is_enabled(some_files, cap_out):
65+
@pytest.mark.usefixtures('some_files')
66+
def test_multiline_multiline_flag_is_enabled(cap_out):
6267
ret = pygrep.main(('--multiline', r'foo$.*bar', 'f1', 'f2', 'f3'))
6368
out = cap_out.get()
6469
assert ret == 1

0 commit comments

Comments
 (0)