[pypy-svn] r36494 - pypy/dist/pypy/tool/test

[fijal at codespeak.net]

Author: fijal
Date: Thu Jan 11 16:08:20 2007
New Revision: 36494

Modified:
   pypy/dist/pypy/tool/test/test_conftest1.py
Log:
Adhere to new pylib semantics


Modified: pypy/dist/pypy/tool/test/test_conftest1.py
==============================================================================
--- pypy/dist/pypy/tool/test/test_conftest1.py	(original)
+++ pypy/dist/pypy/tool/test/test_conftest1.py	Thu Jan 11 16:08:20 2007
@@ -2,11 +2,12 @@
 import py
 
 innertest = py.magic.autopath().dirpath('conftest1_innertest.py')
+from py.__.test.terminal.terminal import TerminalSession
 
 class TestPyPyTests: 
     def test_select_interplevel(self): 
         config, args = py.test.Config.parse(['-k', 'interplevel'])
-        session = py.test.TerminalSession(config, py.std.sys.stdout)
+        session = TerminalSession(config, py.std.sys.stdout)
         session.main([innertest])
         l = session.getitemoutcomepairs(py.test.Item.Passed)
         assert len(l) == 2 
@@ -21,7 +22,7 @@
 
     def test_select_applevel(self): 
         config, args = py.test.Config.parse(['-k', 'applevel'])
-        session = py.test.TerminalSession(config, py.std.sys.stdout)
+        session = TerminalSession(config, py.std.sys.stdout)
         session.main([innertest])
         l = session.getitemoutcomepairs(py.test.Item.Passed)
         assert len(l) == 2 
@@ -36,7 +37,7 @@
 
     def XXX_test_appdirect(self):
         config, args = py.test.Config.parse(['-k', 'applevel', '--appdirect', str(innertest)])
-        session = py.test.TerminalSession(config, py.std.sys.stdout)
+        session = TerminalSession(config, py.std.sys.stdout)
         session.main([innertest])
         l = session.getitemoutcomepairs(py.test.Item.Passed)
         assert len(l) == 2