Applied automated fixes from ruff PT pytest ruleset

Author: tleonhardt

cmd2/transcript.py

@@ -108,9 +108,9 @@ def _test_transcript(self, fname: str, transcript: Iterator[str]) -> None:
             # Read the expected result from transcript
             if ansi.strip_style(line).startswith(self.cmdapp.visible_prompt):
                 message = f'\nFile {fname}, line {line_num}\nCommand was:\n{command}\nExpected: (nothing)\nGot:\n{result}\n'
-                self.assertTrue(not (result.strip()), message)
+                assert not result.strip(), message
                 # If the command signaled the application to quit there should be no more commands
-                self.assertFalse(stop, stop_msg)
+                assert not stop, stop_msg
                 continue
             expected_parts = []
             while not ansi.strip_style(line).startswith(self.cmdapp.visible_prompt):
@@ -124,13 +124,13 @@ def _test_transcript(self, fname: str, transcript: Iterator[str]) -> None:
 
             if stop:
                 # This should only be hit if the command that set stop to True had output text
-                self.assertTrue(finished, stop_msg)
+                assert finished, stop_msg
 
             # transform the expected text into a valid regular expression
             expected = ''.join(expected_parts)
             expected = self._transform_transcript_expected(expected)
             message = f'\nFile {fname}, line {line_num}\nCommand was:\n{command}\nExpected:\n{expected}\nGot:\n{result}\n'
-            self.assertTrue(re.match(expected, result, re.MULTILINE | re.DOTALL), message)
+            assert re.match(expected, result, re.MULTILINE | re.DOTALL), message
 
     def _transform_transcript_expected(self, s: str) -> str:
         r"""Parse the string with slashed regexes into a valid regex.

pyproject.toml

@@ -199,7 +199,7 @@ select = [
     "PLE",  # Pylint Errors
     # "PLR", # Pylint Refactoring suggestions
     "PLW", # Pylint Warnings
-    # "PT", # flake8-pytest-style (warnings about unit test best practices)
+    # "PT",  # flake8-pytest-style (warnings about unit test best practices)
     # "PTH",  # flake8-use-pathlib (force use of pathlib instead of os.path)
     "PYI", # flake8-pyi (warnings related to type hint best practices)
     # "Q",    # flake8-quotes (force double quotes)

tests/test_ansi.py

@@ -148,7 +148,7 @@ def test_set_title():
 
 
 @pytest.mark.parametrize(
-    'cols, prompt, line, cursor, msg, expected',
+    ('cols', 'prompt', 'line', 'cursor', 'msg', 'expected'),
     [
         (
             127,
@@ -230,7 +230,7 @@ def test_sequence_str_building(ansi_sequence):
 
 
 @pytest.mark.parametrize(
-    'r, g, b, valid',
+    ('r', 'g', 'b', 'valid'),
     [
         (0, 0, 0, True),
         (255, 255, 255, True),

tests/test_argparse_completer.py

@@ -361,7 +361,7 @@ def test_bad_subcommand_help(ac_app):
 
 
 @pytest.mark.parametrize(
-    'command, text, completions',
+    ('command', 'text', 'completions'),
     [
         ('', 'mus', ['music ']),
         ('music', 'cre', ['create ']),
@@ -388,7 +388,7 @@ def test_complete_help(ac_app, command, text, completions):
 
 
 @pytest.mark.parametrize(
-    'subcommand, text, completions',
+    ('subcommand', 'text', 'completions'),
     [('create', '', ['jazz', 'rock']), ('create', 'ja', ['jazz ']), ('create', 'foo', []), ('creab', 'ja', [])],
 )
 def test_subcommand_completions(ac_app, subcommand, text, completions):
@@ -406,7 +406,7 @@ def test_subcommand_completions(ac_app, subcommand, text, completions):
 
 
 @pytest.mark.parametrize(
-    'command_and_args, text, completion_matches, display_matches',
+    ('command_and_args', 'text', 'completion_matches', 'display_matches'),
     [
         # Complete all flags (suppressed will not show)
         (
@@ -547,13 +547,12 @@ def test_autcomp_flag_completion(ac_app, command_and_args, text, completion_matc
     else:
         assert first_match is None
 
-    assert ac_app.completion_matches == sorted(
-        completion_matches, key=ac_app.default_sort_key
-    ) and ac_app.display_matches == sorted(display_matches, key=ac_app.default_sort_key)
+    assert ac_app.completion_matches == sorted(completion_matches, key=ac_app.default_sort_key)
+    assert ac_app.display_matches == sorted(display_matches, key=ac_app.default_sort_key)
 
 
 @pytest.mark.parametrize(
-    'flag, text, completions',
+    ('flag', 'text', 'completions'),
     [
         ('-l', '', ArgparseCompleterTester.static_choices_list),
         ('--list', 's', ['static', 'stop']),
@@ -588,7 +587,7 @@ def test_autocomp_flag_choices_completion(ac_app, flag, text, completions):
 
 
 @pytest.mark.parametrize(
-    'pos, text, completions',
+    ('pos', 'text', 'completions'),
     [
         (1, '', ArgparseCompleterTester.static_choices_list),
         (1, 's', ['static', 'stop']),
@@ -639,11 +638,12 @@ def test_flag_sorting(ac_app):
     begidx = endidx - len(text)
 
     first_match = complete_tester(text, line, begidx, endidx, ac_app)
-    assert first_match is not None and ac_app.completion_matches == option_strings
+    assert first_match is not None
+    assert ac_app.completion_matches == option_strings
 
 
 @pytest.mark.parametrize(
-    'flag, text, completions',
+    ('flag', 'text', 'completions'),
     [('-c', '', ArgparseCompleterTester.completions_for_flag), ('--completer', 'f', ['flag', 'fairly'])],
 )
 def test_autocomp_flag_completers(ac_app, flag, text, completions):
@@ -661,7 +661,7 @@ def test_autocomp_flag_completers(ac_app, flag, text, completions):
 
 
 @pytest.mark.parametrize(
-    'pos, text, completions',
+    ('pos', 'text', 'completions'),
     [
         (1, '', ArgparseCompleterTester.completions_for_pos_1),
         (1, 'p', ['positional_1', 'probably']),
@@ -763,7 +763,7 @@ def test_completion_items(ac_app):
 
 
 @pytest.mark.parametrize(
-    'num_aliases, show_description',
+    ('num_aliases', 'show_description'),
     [
         # The number of completion results determines if the description field of CompletionItems gets displayed
         # in the tab completions. The count must be greater than 1 and less than ac_app.max_completion_items,
@@ -803,7 +803,7 @@ def test_max_completion_items(ac_app, num_aliases, show_description):
 
 
 @pytest.mark.parametrize(
-    'args, completions',
+    ('args', 'completions'),
     [
         # Flag with nargs = 2
         ('--set_value', ArgparseCompleterTester.set_value_choices),
@@ -869,7 +869,7 @@ def test_autcomp_nargs(ac_app, args, completions):
 
 
 @pytest.mark.parametrize(
-    'command_and_args, text, is_error',
+    ('command_and_args', 'text', 'is_error'),
     [
         # Flag is finished before moving on
         ('hint --flag foo --', '', False),
@@ -986,7 +986,7 @@ def test_completion_items_descriptive_header(ac_app):
 
 
 @pytest.mark.parametrize(
-    'command_and_args, text, has_hint',
+    ('command_and_args', 'text', 'has_hint'),
     [
         # Normal cases
         ('hint', '', True),
@@ -1045,7 +1045,7 @@ def test_autocomp_hint_no_help_text(ac_app, capsys):
 
 
 @pytest.mark.parametrize(
-    'args, text',
+    ('args', 'text'),
     [
         # Exercise a flag arg and choices function that raises a CompletionError
         ('--choice ', 'choice'),
@@ -1066,7 +1066,7 @@ def test_completion_error(ac_app, capsys, args, text):
 
 
 @pytest.mark.parametrize(
-    'command_and_args, completions',
+    ('command_and_args', 'completions'),
     [
         # Exercise a choices function that receives arg_tokens dictionary
         ('arg_tokens choice subcmd', ['choice', 'subcmd']),
@@ -1092,7 +1092,7 @@ def test_arg_tokens(ac_app, command_and_args, completions):
 
 
 @pytest.mark.parametrize(
-    'command_and_args, text, output_contains, first_match',
+    ('command_and_args', 'text', 'output_contains', 'first_match'),
     [
         # Group isn't done. Hint will show for optional positional and no completions returned
         ('mutex', '', 'the optional positional', None),
@@ -1188,7 +1188,9 @@ def test_complete_command_help_no_tokens(ac_app):
     assert not completions
 
 
-@pytest.mark.parametrize('flag, completions', [('--provider', standalone_choices), ('--completer', standalone_completions)])
+@pytest.mark.parametrize(
+    ('flag', 'completions'), [('--provider', standalone_choices), ('--completer', standalone_completions)]
+)
 def test_complete_standalone(ac_app, flag, completions):
     text = ''
     line = 'standalone {} {}'.format(flag, text)

tests/test_argparse_custom.py

@@ -49,7 +49,7 @@ def fake_func():
 
 
 @pytest.mark.parametrize(
-    'kwargs, is_valid',
+    ('kwargs', 'is_valid'),
     [
         ({'choices_provider': fake_func}, True),
         ({'completer': fake_func}, True),

tests/test_cmd2.py

@@ -221,7 +221,7 @@ def test_set_no_settables(base_app):
 
 
 @pytest.mark.parametrize(
-    'new_val, is_valid, expected',
+    ('new_val', 'is_valid', 'expected'),
     [
         (ansi.AllowStyle.NEVER, True, ansi.AllowStyle.NEVER),
         ('neVeR', True, ansi.AllowStyle.NEVER),
@@ -391,7 +391,8 @@ def test_run_script_with_empty_file(base_app, request):
     test_dir = os.path.dirname(request.module.__file__)
     filename = os.path.join(test_dir, 'scripts', 'empty.txt')
     out, err = run_cmd(base_app, 'run_script {}'.format(filename))
-    assert not out and not err
+    assert not out
+    assert not err
     assert base_app.last_result is True
 
 
@@ -741,7 +742,8 @@ def test_pipe_to_shell(base_app):
         command = 'help help | wc'
 
     out, err = run_cmd(base_app, command)
-    assert out and not err
+    assert out
+    assert not err
 
 
 def test_pipe_to_shell_and_redirect(base_app):
@@ -755,7 +757,8 @@ def test_pipe_to_shell_and_redirect(base_app):
         command = 'help help | wc > {}'.format(filename)
 
     out, err = run_cmd(base_app, command)
-    assert not out and not err
+    assert not out
+    assert not err
     assert os.path.exists(filename)
     os.remove(filename)
 
@@ -807,7 +810,8 @@ def test_get_paste_buffer_exception(base_app, mocker, capsys):
     out, err = capsys.readouterr()
     assert out == ''
     # this just checks that cmd2 is surfacing whatever error gets raised by pyperclip.paste
-    assert 'ValueError' in err and 'foo' in err
+    assert 'ValueError' in err
+    assert 'foo' in err
 
 
 def test_allow_clipboard_initializer(base_app):
@@ -1493,7 +1497,7 @@ def test_select_uneven_list_of_tuples(select_app, monkeypatch):
 
 
 @pytest.mark.parametrize(
-    'selection, type_str',
+    ('selection', 'type_str'),
     [
         ('1', "<class 'int'>"),
         ('2', "<class 'str'>"),
@@ -2889,7 +2893,8 @@ def test_disable_and_enable_category(disable_commands_app):
     begidx = endidx - len(text)
 
     first_match = complete_tester(text, line, begidx, endidx, disable_commands_app)
-    assert first_match is not None and disable_commands_app.completion_matches == ['result ']
+    assert first_match is not None
+    assert disable_commands_app.completion_matches == ['result ']
 
     # has_no_helper_funcs had no completer originally, so there should be no results
     text = ''