floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue384 by removing the trial support code

Browse Source
This commit is contained in:
Ronny Pfannschmidt
2013-11-19 10:58:24 +01:00
parent 1fd1617427
commit eda8b02a8d
3 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
testing/test_unittest.py
View File

@@ -310,9 +310,10 @@ def test_module_level_pytestmark(testdir):
reprec.assertoutcome(skipped=1)
def test_testcase_skip_property(testdir):
def test_trial_testcase_skip_property(testdir):
testpath = testdir.makepyfile("""
import unittest
from twisted.trial import unittest
class MyTestCase(unittest.TestCase):
skip = 'dont run'
def test_func(self):
@@ -321,9 +322,11 @@ def test_testcase_skip_property(testdir):
reprec = testdir.inline_run(testpath, "-s")
reprec.assertoutcome(skipped=1)
def test_testfunction_skip_property(testdir):
def test_trial_testfunction_skip_property(testdir):
pytest.importorskip('twisted.trial.unittest')
testpath = testdir.makepyfile("""
import unittest
from twisted.trial import unittest
class MyTestCase(unittest.TestCase):
def test_func(self):
pass
@@ -333,6 +336,32 @@ def test_testfunction_skip_property(testdir):
reprec.assertoutcome(skipped=1)
def test_trial_testcase_todo_property(testdir):
testpath = testdir.makepyfile("""
from twisted.trial import unittest
class MyTestCase(unittest.TestCase):
todo = 'dont run'
def test_func(self):
assert 0
""")
reprec = testdir.inline_run(testpath, "-s")
reprec.assertoutcome(skipped=1)
def test_trial_testfunction_todo_property(testdir):
pytest.importorskip('twisted.trial.unittest')
testpath = testdir.makepyfile("""
from twisted.trial import unittest
class MyTestCase(unittest.TestCase):
def test_func(self):
assert 0
test_func.todo = 'dont run'
""")
reprec = testdir.inline_run(testpath, "-s")
reprec.assertoutcome(skipped=1)
class TestTrialUnittest:
def setup_class(cls):
cls.ut = pytest.importorskip("twisted.trial.unittest")