merge

CHANGELOG

@@ -1,6 +1,8 @@
 Changes between 2.2.4 and 2.3.0.dev
 -----------------------------------
 
+- fix "python setup.py test" example to cause a proper "errno" return
+- fix issue165 - fix broken doc links and mention stackoverflow for FAQ
 - fix issue139 - merge FuncargRequest and Item API such that 
   funcarg-functionality is now directly available on the "item" 
   object passed to the various pytest_runtest hooks.  This allows more 

doc/en/announce/release-2.0.1.txt

@@ -57,7 +57,7 @@ Changes between 2.0.0 and 2.0.1
 - refinements to "collecting" output on non-ttys
 - refine internal plugin registration and --traceconfig output
 - introduce a mechanism to prevent/unregister plugins from the
-  command line, see http://pytest.org/plugins.html#cmdunregister
+  command line, see http://pytest.org/latest/plugins.html#cmdunregister
 - activate resultlog plugin by default
 - fix regression wrt yielded tests which due to the
   collection-before-running semantics were not

doc/en/contact.txt

@@ -9,6 +9,10 @@ Contact channels
   2.0 and above).  You may also peek at the `old issue tracker`_ but please
   don't submit bugs there anymore.
 
+- `pytest on stackoverflow.com <http://stackoverflow.com/search?q=pytest>`_ 
+  to post questions with the tag ``pytest``.  New Questions will usually 
+  be seen by pytest users or developers. 
+
 - `Testing In Python`_: a mailing list for Python testing tools and discussion.
 
 - `py-dev developers list`_ pytest specific announcements and discussions.

doc/en/example/parametrize.txt

@@ -122,7 +122,7 @@ we'll get an error on the last one.
 A quick port of "testscenarios"
 ------------------------------------
 
-.. _`test scenarios`: http://bazaar.launchpad.net/~lifeless/testscenarios/trunk/annotate/head%3A/doc/example.py
+.. _`test scenarios`: http://pypi.python.org/pypi/testscenarios/
 
 Here is a quick port to run tests configured with `test scenarios`_,
 an add-on from Robert Collins for the standard unittest framework. We

doc/en/faq.txt

@@ -3,8 +3,9 @@ Some Issues and Questions
 
 .. note::
 
-    If you don't find an answer here, checkout the :ref:`contact channels`
-    to get help.
+    If you don't find an answer here, you may checkout 
+    `pytest Q&A at Stackoverflow <http://stackoverflow.com/search?q=pytest>`_ 
+    or other :ref:`contact channels` to get help.
 
 On naming, nosetests, licensing and magic
 ------------------------------------------------
@@ -36,7 +37,7 @@ In 2012, some work is going into the `pytest-django plugin <http://pypi.python.o
 ``manage.py test`` and allows to use all pytest features_ most of which
 are not available from Django directly.
 
-.. _features: test/features.html
+.. _features: features.html
 
 
 What's this "magic" with py.test? (historic notes)
@@ -93,7 +94,7 @@ is another tool named "pytest" we just decided to stick with
 Function arguments, parametrized tests and setup
 -------------------------------------------------------
 
-.. _funcargs: test/funcargs.html
+.. _funcargs: funcargs.html
 
 Is using funcarg- versus xUnit setup a style question?
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -107,9 +108,9 @@ code (like e.g. the monkeypatch_, the tmpdir_ or capture_ funcargs)
 because the support code can register setup/teardown functions
 in a managed class/module/function scope.
 
-.. _monkeypatch: test/plugin/monkeypatch.html
-.. _tmpdir: test/plugin/tmpdir.html
-.. _capture: test/plugin/capture.html
+.. _monkeypatch: monkeypatch.html
+.. _tmpdir: tmpdir.html
+.. _capture: capture.html
 
 .. _`why pytest_pyfuncarg__ methods?`:
 

doc/en/goodpractises.txt

@@ -103,6 +103,7 @@ which means its really easy to extend its test command
 to support running a pytest from test requirements::
 
     from setuptools.command.test import test as TestCommand
+    import sys
 
     class PyTest(TestCommand):
         def finalize_options(self):
@@ -112,7 +113,8 @@ to support running a pytest from test requirements::
         def run_tests(self):
             #import here, cause outside the eggs aren't loaded
             import pytest
-            pytest.main(self.test_args)
+            errno = pytest.main(self.test_args)
+            sys.exit(errno)
 
     setup(
         #...,

doc/en/projects.txt

@@ -32,7 +32,7 @@ Here are some examples of projects using py.test (please send notes via :ref:`co
 * `XIST <http://www.livinglogic.de/Python/xist/>`_ extensible HTML/XML generator
 * `tiddlyweb <http://pypi.python.org/pypi/tiddlyweb>`_ optionally headless, extensible RESTful datastore
 * `fancycompleter <http://bitbucket.org/antocuni/fancycompleter/src>`_ for colorful tab-completion
-* `Paludis <http://paludis-tools.lunaryorn.de/>`_ tools for Gentoo Paludis package manager
+* `Paludis <http://paludis.exherbo.org/>`_ tools for Gentoo Paludis package manager
 * `Gerald <http://halfcooked.com/code/gerald/>`_ schema comparison tool
 * `abjad <http://code.google.com/p/abjad/>`_ Python API for Formalized Score control
 * `bu <http://packages.python.org/bu/>`_ a microscopic build system

doc/en/usage.txt

@@ -130,7 +130,7 @@ To create plain-text machine-readable result files you can issue::
 and look at the content at the ``path`` location.  Such files are used e.g.
 by the `PyPy-test`_ web page to show test results over several revisions.
 
-.. _`PyPy-test`: http://codespeak.net:8099/summary
+.. _`PyPy-test`: http://buildbot.pypy.org/summary
 
 
 Sending test report to pocoo pastebin service
@@ -148,7 +148,7 @@ for example ``-x`` if you only want to send one particular failure.
 
     py.test --pastebin=all
 
-Currently only pasting to the http://paste.pocoo.org service is implemented.
+Currently only pasting to the http://bpaste.net service is implemented.
 
 Calling pytest from Python code
 ----------------------------------------------------