[pypy-svn] r8199 - pypy/branch/src-pytest/pypy

[hpk at codespeak.net]

Author: hpk
Date: Mon Jan 10 19:27:28 2005
New Revision: 8199

Modified:
   pypy/branch/src-pytest/pypy/conftest.py
   pypy/branch/src-pytest/pypy/test_all.py
Log:
- test_all is now more or less a synonym for py.test 
  (or do we want to erase it all-together?)

- a more fun docustring 


Modified: pypy/branch/src-pytest/pypy/conftest.py
==============================================================================
--- pypy/branch/src-pytest/pypy/conftest.py	(original)
+++ pypy/branch/src-pytest/pypy/conftest.py	Mon Jan 10 19:27:28 2005
@@ -62,7 +62,8 @@
 
     def collect_app_function(self, extpy): 
         if extpy.check(func=1, basestarts='app_test_'):
-            assert not extpy.check(genfunc=1), "you must be joking" 
+            assert not extpy.check(genfunc=1), (
+                "generator app level functions? you must be joking")
             yield AppTestFunction(extpy)
             
     def collect_class(self, extpy): 

Modified: pypy/branch/src-pytest/pypy/test_all.py
==============================================================================
--- pypy/branch/src-pytest/pypy/test_all.py	(original)
+++ pypy/branch/src-pytest/pypy/test_all.py	Mon Jan 10 19:27:28 2005
@@ -1,8 +1,5 @@
 #! /usr/bin/env python
 
 import tool.autopath
-from pypy.tool import testit
-
-if __name__ == '__main__':
-    testit.main(tool.autopath.pypydir)
-
+from py.__impl__.test.cmdline import main
+main()