Fix handling of pkg init and test file via args

Ref: pytest-dev#4344 (comment)
blueyed · Feb 8, 2019 · 82a1d6a · 82a1d6a
1 parent ea73246
commit 82a1d6a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/_pytest/main.py b/src/_pytest/main.py
@@ -592,7 +592,7 @@ def filter_(f):
                 col = self._node_cache[argpath]
             else:
                 collect_root = self._pkg_roots.get(argpath.dirname, self)
-                col = collect_root._collectfile(argpath)
+                col = collect_root._collectfile(argpath, handle_dupes=False)
                 if col:
                     self._node_cache[argpath] = col
             m = self.matchnodes(col, names)

diff --git a/testing/test_collection.py b/testing/test_collection.py
@@ -1144,3 +1144,14 @@ def test_nodeid(request):
         ]
     )
     assert result.ret == 0
+
+
+def test_collect_pkg_init_and_file_in_args(testdir):
+    subdir = testdir.mkdir("sub")
+    init = subdir.ensure("__init__.py")
+    init.write("def test_init(): pass")
+    p = subdir.ensure("test_file.py")
+    p.write("def test_file(): pass")
+
+    result = testdir.runpytest(str(init), str(p))
+    result.stdout.fnmatch_lines(["*2 passed in*"])