From 029451edab1b3240a9b7b07f69209cc96f591db7 Mon Sep 17 00:00:00 2001
From: hpk <none@none>
Date: Sun, 21 Sep 2008 09:17:00 +0200
Subject: [PATCH] [svn r58285] add docstring and version info

--HG--
branch : trunk
---
 contrib/py_unittest/conftest.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/contrib/py_unittest/conftest.py b/contrib/py_unittest/conftest.py
index e798b4791..0e7d9ad27 100644
--- a/contrib/py_unittest/conftest.py
+++ b/contrib/py_unittest/conftest.py
@@ -1,7 +1,23 @@
+"""
+
+    collect and run traditional "unittest.py" style tests. 
+
+    drop this conftest.py into your project directory so that
+    all testing directories are below it. 
+
+    you can mix unittest TestCase subclasses and 
+    py.test style tests (discovery based on name). 
+
+    user-extensions such as a custom test_suite() 
+    will not be considered (see XXX). 
+
+$Id: conftest.py 58285 2008-09-21 07:17:00Z hpk $
+"""
 import py
 import unittest
 import sys
-unittest.failureException = AssertionError
+
+__version__ = "$Rev: 58285 $".split()[1]
 
 def configproperty(name):
     def fget(self):