[pypy-svn] r58008 - pypy/branch/pypy-pytrunk/pypy/tool/test

[hpk at codespeak.net]

Author: hpk
Date: Tue Sep  9 18:35:19 2008
New Revision: 58008

Modified:
   pypy/branch/pypy-pytrunk/pypy/tool/test/test_conftest1.py
Log:
fix tests by using some test machinery more directly



Modified: pypy/branch/pypy-pytrunk/pypy/tool/test/test_conftest1.py
==============================================================================
--- pypy/branch/pypy-pytrunk/pypy/tool/test/test_conftest1.py	(original)
+++ pypy/branch/pypy-pytrunk/pypy/tool/test/test_conftest1.py	Tue Sep  9 18:35:19 2008
@@ -2,39 +2,24 @@
 import py
 
 innertest = py.magic.autopath().dirpath('conftest1_innertest.py')
-from py.__.test.terminal.terminal import TerminalSession
-from py.__.test.outcome import Passed, Failed, Skipped
+from py.__.test.testing import suptest 
 
-class TestPyPyTests: 
+class TestPyPyTests(suptest.InlineSession): 
     def test_select_interplevel(self): 
-        config = py.test.config._reparse([innertest, '-k', 'interplevel'])
-        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 ('test_something', 'test_method')
-        #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 ('app_test_something', 'test_method_app')
+        sorter = self.parse_and_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): 
-        config = py.test.config._reparse([innertest, '-k', 'applevel'])
-        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')
+        sorter = self.parse_and_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,