Commits

holger krekel committed 20fce72

another small adaptation to namespace change

Comments (0)

Files changed (1)

lib-python/conftest.py

 from pypy.tool.pytest.result import Result, ResultFromMime
 
 pypyexecpath = pypydir.join('bin', 'pypy-c')
+
+dist_rsync_roots = ['.', '../pypy', '../py']
     
 # 
 # Interfacing/Integrating with py.test's collection process 
         if appexcinfo.traceback: 
             print "appexcinfo.traceback:"
             py.std.pprint.pprint(appexcinfo.traceback)
-            raise py.test.Item.Failed(excinfo=appexcinfo) 
-        raise py.test.Item.Failed(excinfo=ilevelinfo) 
+            raise py.test.collect.Item.Failed(excinfo=appexcinfo) 
+        raise py.test.collect.Item.Failed(excinfo=ilevelinfo) 
 
 #
 # compliance modules where we invoke test_main() usually call into 
     w_namemethods, w_doctestlist = space.unpacktuple(w_result) 
     return w_namemethods, w_doctestlist 
 
-class SimpleRunItem(py.test.Item): 
+class SimpleRunItem(py.test.collect.Item): 
     """ Run a module file and compare its output 
         to the expected output in the output/ directory. 
     """ 
         except KeyError: 
             pass
 
-class AppDocTestModule(py.test.Item): 
+class AppDocTestModule(py.test.collect.Item): 
     def __init__(self, name, parent, w_module): 
         super(AppDocTestModule, self).__init__(name, parent) 
         self.w_module = w_module 
     def run(self): 
         py.test.skip("application level doctest modules not supported yet.")
     
-class AppTestCaseMethod(py.test.Item): 
+class AppTestCaseMethod(py.test.collect.Item): 
     def __init__(self, name, parent, w_method): 
         super(AppTestCaseMethod, self).__init__(name, parent) 
         self.space = gettestobjspace() 
 import socket
 import getpass
 
-class ReallyRunFileExternal(py.test.Item): 
+class ReallyRunFileExternal(py.test.collect.Item): 
     _resultcache = None
     def haskeyword(self, keyword): 
         if keyword == 'core': 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.