[pypy-svn] r62509 - pypy/trunk/pypy/tool/test
hpk at codespeak.net
hpk at codespeak.net
Wed Mar 4 09:29:43 CET 2009
Author: hpk
Date: Wed Mar 4 09:29:43 2009
New Revision: 62509
Modified:
pypy/trunk/pypy/tool/test/test_conftest1.py
Log:
fix test to work with py/trunk correctly
Modified: pypy/trunk/pypy/tool/test/test_conftest1.py
==============================================================================
--- pypy/trunk/pypy/tool/test/test_conftest1.py (original)
+++ pypy/trunk/pypy/tool/test/test_conftest1.py Wed Mar 4 09:29:43 2009
@@ -2,38 +2,31 @@
import py
innertest = py.magic.autopath().dirpath('conftest1_innertest.py')
-from py.__.test.testing import suptest
+pytest_plugins = "pytest_pytester"
-class TestPyPyTests(suptest.InlineSession):
- def test_select_interplevel(self):
- sorter = self.parse_and_run("-k", "interplevel", innertest)
+class TestPyPyTests:
+ def test_select_interplevel(self, testdir):
+ sorter = testdir.inline_run("-k", "interplevel", innertest)
passed, skipped, failed = sorter.listoutcomes()
assert len(passed) == 2
assert not skipped and not failed
for repevent in passed:
assert repevent.colitem.name in ('test_something', 'test_method')
- def test_select_applevel(self):
- sorter = self.parse_and_run("-k", "applevel", innertest)
+ def test_select_applevel(self, testdir):
+ sorter = testdir.inline_run("-k", "applevel", innertest)
passed, skipped, failed = sorter.listoutcomes()
assert len(passed) == 2
assert not skipped and not failed
for repevent in passed:
assert repevent.colitem.name in ('app_test_something', 'test_method_app')
- def XXX_test_appdirect(self):
- config = py.test.config._reparse([innertest,
- '-k', 'applevel', '--appdirect'])
- session = TerminalSession(config, py.std.sys.stdout)
- session.main()
- l = session.getitemoutcomepairs(Passed)
- assert len(l) == 2
- for item in l:
- assert item[0].name in ('app_test_something', 'test_method_app')
- #item = l[0][0]
- #assert item.name == 'test_one'
- l = session.getitemoutcomepairs(Skipped)
- assert len(l) == 2
- for item in l:
- assert item[0].name in ('test_something', 'test_method')
+ def test_appdirect(self, testdir):
+ sorter = testdir.inline_run(innertest, '-k', 'applevel', '--runappdirect')
+ passed, skipped, failed = sorter.listoutcomes()
+ assert len(passed) == 2
+ print passed
+ names = [x.colitem.name for x in passed]
+ assert 'app_test_something' in names
+ assert 'test_method_app' in names
More information about the Pypy-commit
mailing list