[py-svn] r8049 - in py/dist/py/documentation: . example/pytest example/testing testing

[hpk at codespeak.net]

Author: hpk
Date: Mon Jan  3 13:19:09 2005
New Revision: 8049

Added:
   py/dist/py/documentation/example/pytest/
      - copied from r8048, py/dist/py/documentation/example/testing/
   py/dist/py/documentation/rest_test.py
      - copied, changed from r8048, py/dist/py/documentation/testing/rest_test.py
Removed:
   py/dist/py/documentation/example/testing/
   py/dist/py/documentation/testing/
Modified:
   py/dist/py/documentation/test.txt
Log:
(of course) fixed accidental changes in the documentation 
directory. 



Copied: py/dist/py/documentation/rest_test.py (from r8048, py/dist/py/documentation/testing/rest_test.py)
==============================================================================
--- py/dist/py/documentation/testing/rest_test.py	(original)
+++ py/dist/py/documentation/rest_test.py	Mon Jan  3 13:19:09 2005
@@ -11,5 +11,9 @@
     #assert not out 
 
 def test_rest_files(): 
+    try: 
+        import docutils 
+    except ImportError: 
+        py.test.skip("docutils not importable") 
     for x in docdir.listdir('*.txt'): 
         yield restcheck, x 

Modified: py/dist/py/documentation/test.txt
==============================================================================
--- py/dist/py/documentation/test.txt	(original)
+++ py/dist/py/documentation/test.txt	Mon Jan  3 13:19:09 2005
@@ -157,7 +157,7 @@
 A lot of care is taken to present nice tracebacks in case of test
 failure. Try::
 
-    py.test py/documentation/example/test/failure_demo.py
+    py.test py/documentation/example/pytest/failure_demo.py
 
 to see a variety of 17 tracebacks, each tailored to a different
 failure situation.
@@ -259,7 +259,7 @@
 Here is a working example for what goes on when you setup modules, 
 classes and methods:: 
 
-    # [[from py/documentation/example/test/test_setup_flow_example.py]]
+    # [[from py/documentation/example/pytest/test_setup_flow_example.py]]
 
     def setup_module(module):
         module.TestStateFullThing.classcount = 0