jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

classes inherit from object

This commit is contained in:
Michael Aquilina 2015-10-01 21:55:51 +01:00
parent d1628944a6
commit 04545f8a54
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/skipping.py
View File

@ -51,7 +51,7 @@ def xfail(reason=""):
raise XFailed(reason) raise XFailed(reason)
xfail.Exception = XFailed xfail.Exception = XFailed
class MarkEvaluator: class MarkEvaluator(object):
def __init__(self, item, name): def __init__(self, item, name):
self.item = item self.item = item
self.name = name self.name = name

6
testing/test_skipping.py
View File

@ -4,7 +4,7 @@ import sys
from _pytest.skipping import MarkEvaluator, folded_skips, pytest_runtest_setup from _pytest.skipping import MarkEvaluator, folded_skips, pytest_runtest_setup
from _pytest.runner import runtestprotocol from _pytest.runner import runtestprotocol
class TestEvaluator: class TestEvaluator(object):
def test_no_marker(self, testdir): def test_no_marker(self, testdir):
item = testdir.getitem("def test_func(): pass") item = testdir.getitem("def test_func(): pass")
evalskipif = MarkEvaluator(item, 'skipif') evalskipif = MarkEvaluator(item, 'skipif')
@ -125,7 +125,7 @@ class TestEvaluator:
assert expl == "condition: config._hackxyz" assert expl == "condition: config._hackxyz"
class TestXFail: class TestXFail(object):
def test_xfail_simple(self, testdir): def test_xfail_simple(self, testdir):
item = testdir.getitem(""" item = testdir.getitem("""
import pytest import pytest
@ -350,7 +350,7 @@ class TestXFail:
]) ])
class TestXFailwithSetupTeardown: class TestXFailwithSetupTeardown(object):
def test_failing_setup_issue9(self, testdir): def test_failing_setup_issue9(self, testdir):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest