From 8406e52b83cebde0189fc092660fa0b375522f50 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 10 Mar 2024 22:33:47 -0400 Subject: [PATCH] spelling: something Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- doc/en/changelog.rst | 2 +- src/_pytest/fixtures.py | 2 +- testing/python/integration.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst index e1cea1cb3..c39267200 100644 --- a/doc/en/changelog.rst +++ b/doc/en/changelog.rst @@ -2899,7 +2899,7 @@ Breaking Changes This hook has been marked as deprecated and not been even called by pytest for over 10 years now. -- :issue:`6673`: Reversed / fix meaning of "+/-" in error diffs. "-" means that sth. expected is missing in the result and "+" means that there are unexpected extras in the result. +- :issue:`6673`: Reversed / fix meaning of "+/-" in error diffs. "-" means that something expected is missing in the result and "+" means that there are unexpected extras in the result. - :issue:`6737`: The ``cached_result`` attribute of ``FixtureDef`` is now set to ``None`` when diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py index 8b25d743c..465f61473 100644 --- a/src/_pytest/fixtures.py +++ b/src/_pytest/fixtures.py @@ -323,7 +323,7 @@ class FuncFixtureInfo: working_set = set(self.initialnames) while working_set: argname = working_set.pop() - # Argname may be smth not included in the original names_closure, + # Argname may be something not included in the original names_closure, # in which case we ignore it. This currently happens with pseudo # FixtureDefs which wrap 'get_direct_param_fixture_func(request)'. # So they introduce the new dependency 'request' which might have diff --git a/testing/python/integration.py b/testing/python/integration.py index 219ebf9ce..c20aaeed8 100644 --- a/testing/python/integration.py +++ b/testing/python/integration.py @@ -163,7 +163,7 @@ class TestMockDecoration: @mock.patch("os.path.abspath") @mock.patch("os.path.normpath") @mock.patch("os.path.basename", new=mock_basename) - def test_someting(normpath, abspath, tmp_path): + def test_something(normpath, abspath, tmp_path): abspath.return_value = "this" os.path.normpath(os.path.abspath("hello")) normpath.assert_any_call("this") @@ -176,7 +176,7 @@ class TestMockDecoration: funcnames = [ call.report.location[2] for call in calls if call.report.when == "call" ] - assert funcnames == ["T.test_hello", "test_someting"] + assert funcnames == ["T.test_hello", "test_something"] def test_mock_sorting(self, pytester: Pytester) -> None: pytest.importorskip("mock", "1.0.1")