fix bug with nonskipped first test in package

This commit is contained in:
Daniil Galiev 2019-09-09 00:27:55 +05:00 committed by Daniel Hahler
parent 14142b9113
commit 9275012ef7
4 changed files with 35 additions and 6 deletions

View File

@ -70,6 +70,7 @@ Daniel Hahler
Daniel Nuri Daniel Nuri
Daniel Wandschneider Daniel Wandschneider
Danielle Jenkins Danielle Jenkins
Daniil Galiev
Dave Hunt Dave Hunt
David Díaz-Barquero David Díaz-Barquero
David Mohr David Mohr

View File

@ -0,0 +1 @@
Fix fail skipping the first test in package marked as ``skip``

View File

@ -251,18 +251,21 @@ class PyobjMixin(PyobjContext):
@property @property
def obj(self): def obj(self):
"""Underlying Python object.""" """Underlying Python object."""
self._mount_obj_if_needed()
return self._obj
@obj.setter
def obj(self, value):
self._obj = value
def _mount_obj_if_needed(self):
obj = getattr(self, "_obj", None) obj = getattr(self, "_obj", None)
if obj is None: if obj is None:
self._obj = obj = self._getobj() self._obj = obj = self._getobj()
# XXX evil hack # XXX evil hack
# used to avoid Instance collector marker duplication # used to avoid Instance collector marker duplication
if self._ALLOW_MARKERS: if self._ALLOW_MARKERS:
self.own_markers.extend(get_unpacked_marks(self.obj)) self.own_markers.extend(get_unpacked_marks(obj))
return obj
@obj.setter
def obj(self, value):
self._obj = value
def _getobj(self): def _getobj(self):
"""Gets the underlying Python object. May be overwritten by subclasses.""" """Gets the underlying Python object. May be overwritten by subclasses."""
@ -628,6 +631,7 @@ class Package(Module):
return path in self.session._initialpaths return path in self.session._initialpaths
def collect(self): def collect(self):
self._mount_obj_if_needed()
this_path = self.fspath.dirpath() this_path = self.fspath.dirpath()
init_module = this_path.join("__init__.py") init_module = this_path.join("__init__.py")
if init_module.check(file=1) and path_matches_patterns( if init_module.check(file=1) and path_matches_patterns(

View File

@ -1162,3 +1162,26 @@ def test_importorskip():
match="^could not import 'doesnotexist': No module named .*", match="^could not import 'doesnotexist': No module named .*",
): ):
pytest.importorskip("doesnotexist") pytest.importorskip("doesnotexist")
def test_skip_package(testdir):
testdir.makepyfile(
__init__="""
import pytest
pytestmark = pytest.mark.skip
"""
)
testdir.makepyfile(
"""
import pytest
def test_skip1():
assert 0
def test_skip2():
assert 0
"""
)
result = testdir.inline_run()
_, skipped, _ = result.listoutcomes()
assert len(skipped) == 2