p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dont explicitly inherit from object

This commit is contained in:
Michael Aquilina 2015-10-03 16:55:04 +01:00
parent 213dbe7a5f
commit 25d74a5919
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/skipping.py
View File

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

8
testing/test_skipping.py
View File

@ -5,7 +5,7 @@ from _pytest.skipping import MarkEvaluator, folded_skips, pytest_runtest_setup
from _pytest.runner import runtestprotocol from _pytest.runner import runtestprotocol
class TestEvaluator(object): class TestEvaluator:
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')
@ -351,7 +351,7 @@ class TestXFail(object):
]) ])
class TestXFailwithSetupTeardown(object): class TestXFailwithSetupTeardown:
def test_failing_setup_issue9(self, testdir): def test_failing_setup_issue9(self, testdir):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest
@ -383,7 +383,7 @@ class TestXFailwithSetupTeardown(object):
]) ])
class TestSkip(object): class TestSkip:
def test_skip_class(self, testdir): def test_skip_class(self, testdir):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest
@ -471,7 +471,7 @@ class TestSkip(object):
"*1 passed*2 skipped*", "*1 passed*2 skipped*",
]) ])
class TestSkipif(object): class TestSkipif:
def test_skipif_conditional(self, testdir): def test_skipif_conditional(self, testdir):
item = testdir.getitem(""" item = testdir.getitem("""
import pytest import pytest