diff --git a/CHANGELOG b/CHANGELOG index 0f004590c..2d3d3bc4f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -428,7 +428,7 @@ v2.4.2 - introduce node.get_marker/node.add_marker API for plugins like pytest-pep8 and pytest-flakes to avoid the messy - details of the node.keywords pseudo-dicts. Adapated + details of the node.keywords pseudo-dicts. Adapted docs. - remove attempt to "dup" stdout at startup as it's icky. @@ -495,7 +495,7 @@ new features: as strings will remain fully supported. - reporting: color the last line red or green depending if - failures/errors occured or everything passed. thanks Christian + failures/errors occurred or everything passed. thanks Christian Theunert. - make "import pdb ; pdb.set_trace()" work natively wrt capturing (no diff --git a/ISSUES.txt b/ISSUES.txt index d9a76cf08..b744a35f1 100644 --- a/ISSUES.txt +++ b/ISSUES.txt @@ -49,7 +49,7 @@ probably makes sense in order to keep the declarative nature. This mirrors the marker-mechanism with respect to a test module but puts it to a directory scale. -When doing larger scoped parametrization it probably becomes neccessary +When doing larger scoped parametrization it probably becomes necessary to allow parametrization to be ignored if the according parameter is not used (currently any parametrized argument that is not present in a function will cause a ValueError). Example: @@ -77,7 +77,7 @@ this would run the test_hello() function three times with three different values for self.db. This could also work with unittest/nose style tests, i.e. it leverages existing test suites without needing to rewrite them. Together with the previously mentioned setup_test() -maybe the setupfunc could be ommitted? +maybe the setupfunc could be omitted? optimizations --------------------------------------------------------------- @@ -229,7 +229,7 @@ tags: feature pytest.ensuretemp and pytest.config are probably the last objects containing global state. Often using them is not -neccessary. This is about trying to get rid of them, i.e. +necessary. This is about trying to get rid of them, i.e. deprecating them and checking with PyPy's usages as well as others. @@ -298,7 +298,7 @@ tags: feature The idea is that you can e.g. import modules in a test and afterwards sys.modules, sys.meta_path etc would be reverted. It can go further -then just importing however, e.g. current working direcroty, file +then just importing however, e.g. current working directory, file descriptors, ... This would probably be done by marking:: @@ -357,7 +357,7 @@ a few use-cases come to mind: id, call = prepare_check(check) # bubble should only prevent exception propagation after a failure # the whole test should still fail - # there might be need for a loer level api and taking custom markers into account + # there might be need for a lower level api and taking custom markers into account with pytest.section(id, bubble=False): call() diff --git a/_pytest/assertion/rewrite.py b/_pytest/assertion/rewrite.py index 57edcd487..5bf7b13cd 100644 --- a/_pytest/assertion/rewrite.py +++ b/_pytest/assertion/rewrite.py @@ -455,7 +455,7 @@ class AssertionRewriter(ast.NodeVisitor): for an overview of how this works. The entry point here is .run() which will iterate over all the - statenemts in an ast.Module and for each ast.Assert statement it + statements in an ast.Module and for each ast.Assert statement it finds call .visit() with it. Then .visit_Assert() takes over and is responsible for creating new ast statements to replace the original assert statement: it re-writes the test of an assertion diff --git a/doc/en/announce/release-2.4.0.txt b/doc/en/announce/release-2.4.0.txt index 5e4eec61e..88130c481 100644 --- a/doc/en/announce/release-2.4.0.txt +++ b/doc/en/announce/release-2.4.0.txt @@ -34,7 +34,7 @@ a full list of details. A few feature highlights: influence the environment before conftest files import ``django``. - reporting: color the last line red or green depending if - failures/errors occured or everything passed. + failures/errors occurred or everything passed. The documentation has been updated to accomodate the changes, see `http://pytest.org `_ @@ -95,7 +95,7 @@ new features: as strings will remain fully supported. - reporting: color the last line red or green depending if - failures/errors occured or everything passed. thanks Christian + failures/errors occurred or everything passed. thanks Christian Theunert. - make "import pdb ; pdb.set_trace()" work natively wrt capturing (no diff --git a/doc/en/announce/release-2.4.2.txt b/doc/en/announce/release-2.4.2.txt index fd087e141..3b4aa95ab 100644 --- a/doc/en/announce/release-2.4.2.txt +++ b/doc/en/announce/release-2.4.2.txt @@ -21,7 +21,7 @@ pytest-2.4.2 is another bug-fixing release: - introduce node.get_marker/node.add_marker API for plugins like pytest-pep8 and pytest-flakes to avoid the messy - details of the node.keywords pseudo-dicts. Adapated + details of the node.keywords pseudo-dicts. Adapted docs. - remove attempt to "dup" stdout at startup as it's icky. diff --git a/doc/en/index.txt b/doc/en/index.txt index 756c4331a..e1806865d 100644 --- a/doc/en/index.txt +++ b/doc/en/index.txt @@ -31,7 +31,7 @@ pytest: helps you write better programs **scales from simple unit to complex functional testing** - :ref:`modular parametrizeable fixtures ` (new in 2.3, - continously improved) + continuously improved) - :ref:`parametrized test functions ` - :ref:`mark` - :ref:`skipping` (improved in 2.4) diff --git a/doc/en/monkeypatch.txt b/doc/en/monkeypatch.txt index 6398bc11e..fa2b250df 100644 --- a/doc/en/monkeypatch.txt +++ b/doc/en/monkeypatch.txt @@ -57,7 +57,7 @@ so that any attempts within tests to create http requests will fail. example: setting an attribute on some class ------------------------------------------------------ -If you need to patch out ``os.getcwd()`` to return an artifical +If you need to patch out ``os.getcwd()`` to return an artificial value:: def test_some_interaction(monkeypatch): diff --git a/doc/en/projects.txt b/doc/en/projects.txt index 0883db36c..e603ea1eb 100644 --- a/doc/en/projects.txt +++ b/doc/en/projects.txt @@ -78,6 +78,6 @@ Some organisations using pytest * `Stups department of Heinrich Heine University Duesseldorf `_ * `cellzome `_ * `Open End, Gothenborg `_ -* `Laboraratory of Bioinformatics, Warsaw `_ +* `Laboratory of Bioinformatics, Warsaw `_ * `merlinux, Germany `_ * many more ... (please be so kind to send a note via :ref:`contact`)