From 0590bc0af17d119bae5115d0d0c8b477d94c5109 Mon Sep 17 00:00:00 2001 From: hpk Date: Tue, 13 Feb 2007 20:10:09 +0100 Subject: [PATCH] [svn r38744] * adding a section about conftest.py files (removing an XXX) * removing dead links --HG-- branch : trunk --- py/doc/impl-test.txt | 13 ++++++++++++- py/doc/test.txt | 4 ---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/py/doc/impl-test.txt b/py/doc/impl-test.txt index 6636107df..1ce66fe9f 100644 --- a/py/doc/impl-test.txt +++ b/py/doc/impl-test.txt @@ -134,7 +134,18 @@ Customizing the testing process writing conftest.py files ----------------------------------- -XXX +You may put conftest.py files containing project-specific +configuration in your project's root directory, it's usually +best to put it just into the same directory level as your +topmost ``__init__.py``. In fact, ``py.test`` performs +an "upwards" search starting from the directory that you specify +to be tested and will lookup configuration values right-to-left. +You may have options that reside e.g. in your home directory +but note that project specific settings will be considered +first. There is a flag that helps you debugging your +conftest.py configurations:: + + py.test --traceconfig adding custom options +++++++++++++++++++++++ diff --git a/py/doc/test.txt b/py/doc/test.txt index b2a624831..d034fb449 100644 --- a/py/doc/test.txt +++ b/py/doc/test.txt @@ -571,11 +571,7 @@ Development Notes Changing the behavior of the web based reporter requires `pypy`_ since the javascript is actually generated fom rpython source. -There exists as well `L/Rsession document`_ which discusses in more details -unique features and developement notes. - .. _`pypy`: http://codespeak.net/pypy -.. _`L/Rsession document`: test-distributed.html Future/Planned Features of py.test ==================================