Do not include the root session with -k

Fixes pytest-dev#7040.
blueyed · Apr 8, 2020 · 37fdb29 · 37fdb29
1 parent 6356583
commit 37fdb29
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/changelog/7040.improvement.rst b/changelog/7040.improvement.rst
@@ -0,0 +1 @@
+The root session item is skipped with ``-k``.
diff --git a/src/_pytest/mark/legacy.py b/src/_pytest/mark/legacy.py
@@ -46,7 +46,7 @@ def from_item(cls, item: "Item") -> "KeywordMapping":
         import pytest
 
         for item in item.listchain():
-            if not isinstance(item, pytest.Instance):
+            if not isinstance(item, (pytest.Instance, pytest.Session)):
                 mapped_names.add(item.name)
 
         # Add the names added as extra keywords to current or parent items

diff --git a/testing/test_mark.py b/testing/test_mark.py
@@ -815,11 +815,7 @@ def test_no_magic_values(self, testdir):
         no double underscored values, like '__dict__',
         and no instance values, like '()'.
         """
-        p = testdir.makepyfile(
-            """
-            def test_one(): assert 1
-        """
-        )
+        p = testdir.makepyfile("def test_one(): assert 1")
 
         def assert_test_is_not_selected(keyword):
             reprec = testdir.inline_run("-k", keyword, p)
@@ -831,6 +827,7 @@ def assert_test_is_not_selected(keyword):
 
         assert_test_is_not_selected("__")
         assert_test_is_not_selected("()")
+        assert_test_is_not_selected(testdir.tmpdir.basename)
 
 
 class TestMarkDecorator: