[py-svn] commit/pytest: RonnyPfannschmidt: merge
Bitbucket
commits-noreply at bitbucket.org
Sat Jul 7 13:21:54 CEST 2012
1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/d50ce2daf212/
changeset: d50ce2daf212
user: RonnyPfannschmidt
date: 2012-07-07 13:21:45
summary: merge
affected #: 8 files
diff -r 2e06f917619d045818b48651714c1ea5d59056e4 -r d50ce2daf212727b324e43b26b838e78612102ed CHANGELOG
--- a/CHANGELOG
+++ b/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
diff -r 2e06f917619d045818b48651714c1ea5d59056e4 -r d50ce2daf212727b324e43b26b838e78612102ed doc/en/announce/release-2.0.1.txt
--- a/doc/en/announce/release-2.0.1.txt
+++ b/doc/en/announce/release-2.0.1.txt
@@ -57,7 +57,7 @@
- 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
diff -r 2e06f917619d045818b48651714c1ea5d59056e4 -r d50ce2daf212727b324e43b26b838e78612102ed doc/en/contact.txt
--- a/doc/en/contact.txt
+++ b/doc/en/contact.txt
@@ -9,6 +9,10 @@
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.
diff -r 2e06f917619d045818b48651714c1ea5d59056e4 -r d50ce2daf212727b324e43b26b838e78612102ed doc/en/example/parametrize.txt
--- a/doc/en/example/parametrize.txt
+++ b/doc/en/example/parametrize.txt
@@ -122,7 +122,7 @@
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
diff -r 2e06f917619d045818b48651714c1ea5d59056e4 -r d50ce2daf212727b324e43b26b838e78612102ed doc/en/faq.txt
--- a/doc/en/faq.txt
+++ b/doc/en/faq.txt
@@ -3,8 +3,9 @@
.. 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 @@
``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 @@
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 @@
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?`:
diff -r 2e06f917619d045818b48651714c1ea5d59056e4 -r d50ce2daf212727b324e43b26b838e78612102ed doc/en/goodpractises.txt
--- a/doc/en/goodpractises.txt
+++ b/doc/en/goodpractises.txt
@@ -103,6 +103,7 @@
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 @@
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(
#...,
diff -r 2e06f917619d045818b48651714c1ea5d59056e4 -r d50ce2daf212727b324e43b26b838e78612102ed doc/en/projects.txt
--- a/doc/en/projects.txt
+++ b/doc/en/projects.txt
@@ -32,7 +32,7 @@
* `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
diff -r 2e06f917619d045818b48651714c1ea5d59056e4 -r d50ce2daf212727b324e43b26b838e78612102ed doc/en/usage.txt
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -130,7 +130,7 @@
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 @@
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
----------------------------------------------------
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the pytest-commit
mailing list