1 new changeset in pytest:
http://bitbucket.org/hpk42/pytest/changeset/29d58eeb5cd9/
changeset: r2159:29d58eeb5cd9
user: hpk42
date: 2011-02-17 14:46:40
summary: doc typo fixes from Victor Garcia, thanks!
affected #: 21 files (74 bytes)
--- a/CHANGELOG Tue Feb 15 23:24:18 2011 +0000
+++ b/CHANGELOG Thu Feb 17 14:46:40 2011 +0100
@@ -4,6 +4,8 @@
- fix issue24 - pytest_assertrepr_compare produces an in-line
exception on python3
+- fixed some typos in the docs (thanks Victor)
+
Changes between 2.0.0 and 2.0.1
----------------------------------------------
--- a/doc/announce/release-2.0.0.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/announce/release-2.0.0.txt Thu Feb 17 14:46:40 2011 +0100
@@ -117,7 +117,7 @@
- py.test.collect.Directory does not exist anymore and it
is not possible to provide an own "Directory" object.
If you have used this and don't know what to do, get
- in contact. We'll figure someting out.
+ in contact. We'll figure something out.
Note that pytest_collect_directory() is still called but
any return value will be ignored. This allows to keep
--- a/doc/announce/release-2.0.1.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/announce/release-2.0.1.txt Thu Feb 17 14:46:40 2011 +0100
@@ -63,5 +63,5 @@
collection-before-running semantics were not
setup as with pytest 1.3.4. Note, however, that
the recommended and much cleaner way to do test
- parametraization remains the "pytest_generate_tests"
+ parametrization remains the "pytest_generate_tests"
mechanism, see the docs.
--- a/doc/assert.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/assert.txt Thu Feb 17 14:46:40 2011 +0100
@@ -91,7 +91,7 @@
.. versionadded:: 2.0
-py.test has rich support for providing context-sensitive informations
+py.test has rich support for providing context-sensitive information
when it encounters comparisons. For example::
# content of test_assert2.py
--- a/doc/customize.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/customize.txt Thu Feb 17 14:46:40 2011 +0100
@@ -58,7 +58,7 @@
[pytest]
addopts = -rsxX -q
-From now on, running ``py.test`` will implicitely add
+From now on, running ``py.test`` will implicitly add
the specified options.
builtin configuration file options
--- a/doc/example/attic.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/example/attic.txt Thu Feb 17 14:46:40 2011 +0100
@@ -48,7 +48,7 @@
example: decorating a funcarg in a test module
--------------------------------------------------------------
-For larger scale setups it's sometimes useful to decorare
+For larger scale setups it's sometimes useful to decorate
a funcarg just for a particular test module. We can
extend the `accept example`_ by putting this in our test module:
--- a/doc/example/parametrize.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/example/parametrize.txt Thu Feb 17 14:46:40 2011 +0100
@@ -67,7 +67,7 @@
As expected when running the full range of ``param1`` values
we'll get an error on the last one.
-Defering the setup of parametrizing resources
+Deferring the setup of parametrizing resources
---------------------------------------------------
.. regendoc:wipe
@@ -271,7 +271,7 @@
--------------------------------------------------------------
Here is a stripped down real-life example of using parametrized
-testing for testing serialization betwee different interpreters.
+testing for testing serialization between different interpreters.
We define a ``test_basic_objects`` function which is to be run
with different sets of arguments for its three arguments::
--- a/doc/faq.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/faq.txt Thu Feb 17 14:46:40 2011 +0100
@@ -13,7 +13,7 @@
++++++++++++++++++++++++++++++++++++++++++++++++++
Some historic, some practical reasons: ``py.test`` used to be part of
-the ``py`` package which provided several developer utitilities,
+the ``py`` package which provided several developer utilities,
all starting with ``py.<TAB>``, providing nice TAB-completion. If
you install ``pip install pycmd`` you get these tools from a separate
package. These days the command line tool could be called ``pytest``
@@ -53,7 +53,7 @@
to show intermediate values if a test fails. If your expression
has side effects the intermediate values may not be the same, obfuscating
the initial error (this is also explained at the command line if it happens).
-``py.test --no-assert`` turns off assert re-intepretation.
+``py.test --no-assert`` turns off assert re-interpretation.
Sidenote: it is good practise to avoid asserts with side effects.
.. _`py namespaces`: index.html
@@ -125,8 +125,8 @@
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
On windows the multiprocess package will instantiate sub processes
-by pickling and thus implicitely re-import a lot of local modules.
-Unfortuantely, setuptools-0.6.11 does not ``if __name__=='__main__'``
+by pickling and thus implicitly re-import a lot of local modules.
+Unfortunately, setuptools-0.6.11 does not ``if __name__=='__main__'``
protect its generated command line script. This leads to infinite
recursion when running a test that instantiates Processes.
--- a/doc/goodpractises.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/goodpractises.txt Thu Feb 17 14:46:40 2011 +0100
@@ -14,20 +14,20 @@
environment. A good tool to help you automate test runs against multiple
dependency configurations or Python interpreters is `tox`_,
independently created by the main py.test author. The latter
-is also useful for integration with the continous integration
+is also useful for integration with the continuous integration
server Hudson_.
.. _`virtualenv`: http://pypi.python.org/pypi/virtualenv
.. _`buildout`: http://www.buildout.org/
.. _pip: http://pypi.python.org/pypi/pip
-Use tox and Continous Integration servers
+Use tox and Continuous Integration servers
-------------------------------------------------
If you are (often) releasing code to the public you
may want to look into `tox`_, the virtualenv test automation
tool and its `pytest support <http://codespeak.net/tox/example/pytest.html>`_.
-The basic idea is to generate a JUnitXML file through the ``--junitxml=PATH``
option and have a continous integration server like Hudson_ pick it up.
+The basic idea is to generate a JUnitXML file through the ``--junitxml=PATH``
option and have a continuous integration server like Hudson_ pick it up.
.. _standalone:
.. _`genscript method`:
--- a/doc/index.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/index.txt Thu Feb 17 14:46:40 2011 +0100
@@ -7,7 +7,7 @@
- **a mature fully featured testing tool**
- runs on Posix/Windows, Python 2.4-3.2, PyPy and Jython
- - continously `tested on many Python interpreters
<http://hudson.testrun.org/view/pytest/job/pytest/>`_
+ - continuously `tested on many Python interpreters
<http://hudson.testrun.org/view/pytest/job/pytest/>`_
- used in :ref:`many projects and organisations <projects>`, ranging from 10
to 10000 tests
- has :ref:`comprehensive documentation <toc>`
- comes with :ref:`tested examples <examples>`
@@ -27,7 +27,7 @@
- advanced :ref:`skip and xfail`
- generic :ref:`marking and test selection <mark>`
- can :ref:`distribute tests to multiple CPUs <xdistcpu>` through :ref:`xdist
plugin <xdist>`
- - can :ref:`continously re-run failing tests <looponfailing>`
+ - can :ref:`continuously re-run failing tests <looponfailing>`
- many :ref:`builtin helpers <pytest helpers>`
- flexible :ref:`Python test discovery`
- unique :ref:`dependency injection through funcargs <funcargs>`
@@ -40,7 +40,7 @@
- supports extended :ref:`xUnit style setup <xunitsetup>`
- supports domain-specific :ref:`non-python tests`
- supports generating testing coverage reports
- - `Javasript unit- and functional testing`_
+ - `Javascript unit- and functional testing`_
- **extensive plugin and customization system**
@@ -48,7 +48,7 @@
- customizations can be per-directory, per-project or per PyPI released
plugins
- it is easy to add command line options or do other kind of add-ons and
customizations.
-.. _`Javasript unit- and functional testing`:
http://pypi.python.org/pypi/oejskit
+.. _`Javascript unit- and functional testing`:
http://pypi.python.org/pypi/oejskit
.. _`easy`:
http://bruynooghe.blogspot.com/2009/12/skipping-slow-test-by-default-in-pytest.html
--- a/doc/plugins.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/plugins.txt Thu Feb 17 14:46:40 2011 +0100
@@ -47,7 +47,7 @@
.. Note::
If you have ``conftest.py`` files which do not reside in a
python package directory (i.e. one containing an ``__init__.py``) then
- "import conftest" can be ambigous because there might be other
+ "import conftest" can be ambiguous because there might be other
``conftest.py`` files as well on your PYTHONPATH or ``sys.path``.
It is thus good practise for projects to either put ``conftest.py``
under a package scope or to never import anything from a
@@ -79,7 +79,7 @@
coverage reporting, compatible with distributed testing
* `pytest-pep8 <http://pypi.python.org/pypi/pytest-pep8>`_:
- a ``--pep8`` option to enable PEP8 compliancy checking.
+ a ``--pep8`` option to enable PEP8 compliance checking.
* `oejskit <http://pypi.python.org/pypi/oejskit>`_:
a plugin to run javascript unittests in life browsers
--- a/doc/skipping.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/skipping.txt Thu Feb 17 14:46:40 2011 +0100
@@ -147,7 +147,7 @@
def test_function():
if not valid_config():
- pytest.xfail("unsuppored configuration")
+ pytest.xfail("unsupported configuration")
skipping on a missing import dependency
@@ -159,7 +159,7 @@
docutils = pytest.importorskip("docutils")
If ``docutils`` cannot be imported here, this will lead to a
-skip outcome of the test. You can also skip dependeing if
+skip outcome of the test. You can also skip depending if
if a library does not come with a high enough version::
docutils = pytest.importorskip("docutils", minversion="0.3")
@@ -175,5 +175,5 @@
def test_function():
if not valid_config():
- pytest.skip("unsuppored configuration")
+ pytest.skip("unsupported configuration")
--- a/doc/talks.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/talks.txt Thu Feb 17 14:46:40 2011 +0100
@@ -30,7 +30,7 @@
distributed testing:
-- `simultanously test your code on all platforms`_ (blog entry)
+- `simultaneously test your code on all platforms`_ (blog entry)
plugin specific examples:
@@ -42,7 +42,7 @@
.. _`many examples in the docs for plugins`: plugin/index.html
.. _`monkeypatch plugin`: plugin/monkeypatch.html
.. _`application setup in test functions with funcargs`: funcargs.html#appsetup
-.. _`simultanously test your code on all platforms`:
http://tetamap.wordpress.com/2009/03/23/new-simultanously-test-your-code-on-all-platforms/
+.. _`simultaneously test your code on all platforms`:
http://tetamap.wordpress.com/2009/03/23/new-simultanously-test-your-code-on-all-platforms/
.. _`monkey patching done right`:
http://tetamap.wordpress.com/2009/03/03/monkeypatching-in-unit-tests-done-right/
.. _`putting test-hooks into local or global plugins`:
http://tetamap.wordpress.com/2009/05/14/putting-test-hooks-into-local-and-global-plugins/
.. _`parametrizing tests, generalized`:
http://tetamap.wordpress.com/2009/05/13/parametrizing-python-tests-generalized/
--- a/doc/test/index.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/test/index.txt Thu Feb 17 14:46:40 2011 +0100
@@ -17,7 +17,7 @@
changelog_: history of changes covering last releases
-**Continous Integration of py.test's own tests and plugins with Hudson**:
+**Continuous Integration of py.test's own tests and plugins with Hudson**:
`http://hudson.testrun.org/view/pytest`_
--- a/doc/test/mission.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/test/mission.txt Thu Feb 17 14:46:40 2011 +0100
@@ -5,7 +5,7 @@
py.test strives to make testing a fun and no-boilerplate effort.
The tool is distributed as part of the `py` package which contains supporting
APIs that
-are also useable independently. The project independent ``py.test`` command
line tool helps you to:
+are also usable independently. The project independent ``py.test`` command
line tool helps you to:
* rapidly collect and run tests
* run unit- or doctests, functional or integration tests
--- a/doc/test/plugin/cov.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/test/plugin/cov.txt Thu Feb 17 14:46:40 2011 +0100
@@ -202,7 +202,7 @@
started.
-Acknowledgements
+Acknowledgments
----------------
Holger Krekel for pytest with its distributed testing support.
--- a/doc/test/plugin/oejskit.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/test/plugin/oejskit.txt Thu Feb 17 14:46:40 2011 +0100
@@ -1,7 +1,7 @@
pytest_oejskit plugin (EXTERNAL)
==========================================
-The `oejskit`_ offers a py.test plugin for running Javascript tests in life
browers. Running inside the browsers comes with some speed cost, on the other
hand it means for example the code is tested against the real-word DOM
implementations.
+The `oejskit`_ offers a py.test plugin for running Javascript tests in life
browsers. Running inside the browsers comes with some speed cost, on the
other hand it means for example the code is tested against the real-word DOM
implementations.
The approach enables to write integration tests such that the JavaScript code
is tested against server-side Python code mocked as necessary. Any server-side
framework that can already be exposed through WSGI (or for which a subset of
WSGI can be written to accommodate the jskit own needs) can play along.
For more info and download please visit the `oejskit PyPI`_ page.
--- a/doc/test/plugin/xdist.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/test/plugin/xdist.txt Thu Feb 17 14:46:40 2011 +0100
@@ -129,7 +129,7 @@
option_tx = ['ssh=myhost//python=python2.5', 'popen//python=python2.5']
option_dist = True
-Any commandline ``--tx`` specifictions will add to the list of
+Any commandline ``--tx`` specifications will add to the list of
available execution environments.
Specifying "rsync" dirs in a conftest.py
--- a/doc/tmpdir.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/tmpdir.txt Thu Feb 17 14:46:40 2011 +0100
@@ -56,7 +56,7 @@
Temporary directories are by default created as sub directories of
the system temporary directory. The base name will be ``pytest-NUM`` where
-``NUM`` will be incremenated with each test run. Moreover, entries older
+``NUM`` will be incremented with each test run. Moreover, entries older
than 3 temporary directories will be removed.
You can override the default temporary directory setting like this::
--- a/doc/usage.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/usage.txt Thu Feb 17 14:46:40 2011 +0100
@@ -101,7 +101,7 @@
creating JUnitXML format files
----------------------------------------------------
-To create result files which can be read by Hudson_ or other Continous
+To create result files which can be read by Hudson_ or other Continuous
integration servers, use this invocation::
py.test --junitxml=path
--- a/doc/xdist.txt Tue Feb 15 23:24:18 2011 +0000
+++ b/doc/xdist.txt Thu Feb 17 14:46:40 2011 +0100
@@ -36,7 +36,7 @@
pip install pytest-xdist
-or use the package in develope/in-place mode with
+or use the package in develop/in-place mode with
a checkout of the `pytest-xdist repository`_ ::
python setup.py develop
@@ -157,7 +157,7 @@
Specifying test exec environments in an ini file
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-pytest (since version 2.0) supports ini-style cofiguration.
+pytest (since version 2.0) supports ini-style configuration.
You can for example make running with three subprocesses
your default like this::
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.
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
