From commits-noreply at bitbucket.org Mon Aug 1 10:56:12 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Mon, 01 Aug 2011 08:56:12 -0000 Subject: [py-svn] commit/pytest: RonnyPfannschmidt: support pytest.set_trace in collection Message-ID: <20110801085612.20406.64509@bitbucket02.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/bbe034e34d7a/ changeset: bbe034e34d7a user: RonnyPfannschmidt date: 2011-08-01 10:53:37 summary: support pytest.set_trace in collection affected #: 2 files (647 bytes) --- a/_pytest/pdb.py Mon Jul 25 21:42:57 2011 -0500 +++ b/_pytest/pdb.py Mon Aug 01 10:53:37 2011 +0200 @@ -19,11 +19,13 @@ class pytestPDB: """ Pseudo PDB that defers to the real pdb. """ item = None + collector = None def set_trace(self): """ invoke PDB set_trace debugging, dropping any IO capturing. """ frame = sys._getframe().f_back - item = getattr(self, 'item', None) + item = self.item or self.collector + if item is not None: capman = item.config.pluginmanager.getplugin("capturemanager") out, err = capman.suspendcapture() @@ -38,6 +40,14 @@ pytestPDB.item = item pytest_runtest_setup = pytest_runtest_call = pytest_runtest_teardown = pdbitem + at pytest.mark.tryfirst +def pytest_make_collect_report(__multicall__, collector): + try: + pytestPDB.collector = collector + return __multicall__.execute() + finally: + pytestPDB.collector = None + def pytest_runtest_makereport(): pytestPDB.item = None --- a/testing/test_pdb.py Mon Jul 25 21:42:57 2011 -0500 +++ b/testing/test_pdb.py Mon Aug 01 10:53:37 2011 +0200 @@ -144,6 +144,19 @@ child.sendeof() child.wait() + def test_pdb_used_in_generate_tests(self, testdir): + p1 = testdir.makepyfile(""" + import pytest + def pytest_generate_tests(metafunc): + pytest.set_trace() + x = 5 + def test_foo(a): + pass + """) + child = testdir.spawn_pytest(str(p1)) + child.expect("x = 5") + child.sendeof() + child.wait() def test_pdb_collection_failure_is_shown(self, testdir): p1 = testdir.makepyfile("""xxx """) result = testdir.runpytest("--pdb", p1) 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. From commits-noreply at bitbucket.org Thu Aug 18 21:40:07 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Thu, 18 Aug 2011 19:40:07 -0000 Subject: [py-svn] commit/pytest: gutworth: windows kicks up a ENOENT when a part of the path is not a dir Message-ID: <20110818194007.1788.7047@bitbucket03.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/6e94b1809f67/ changeset: 6e94b1809f67 user: gutworth date: 2011-08-18 21:39:57 summary: windows kicks up a ENOENT when a part of the path is not a dir affected #: 1 file (83 bytes) --- a/_pytest/assertion/rewrite.py Mon Aug 01 10:53:37 2011 +0200 +++ b/_pytest/assertion/rewrite.py Thu Aug 18 14:39:57 2011 -0500 @@ -158,7 +158,9 @@ try: fp = open(pyc, "wb") except IOError: - if sys.exc_info()[1].errno == errno.ENOTDIR: + err = sys.exc_info()[1].errno + if (err == errno.ENOTDIR or + sys.platform == "win32" and err == errno.ENOENT): # This happens when we get a EEXIST in find_module creating the # __pycache__ directory and __pycache__ is by some non-dir node. return False 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. From commits-noreply at bitbucket.org Thu Aug 18 21:49:26 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Thu, 18 Aug 2011 19:49:26 -0000 Subject: [py-svn] commit/pytest: gutworth: same as 6e94b1809f67: ENOTDIR is ENOENT on windows Message-ID: <20110818194926.13096.53885@bitbucket02.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/7868f79955cc/ changeset: 7868f79955cc user: gutworth date: 2011-08-18 21:49:17 summary: same as 6e94b1809f67: ENOTDIR is ENOENT on windows affected #: 1 file (73 bytes) --- a/_pytest/assertion/rewrite.py Thu Aug 18 14:39:57 2011 -0500 +++ b/_pytest/assertion/rewrite.py Thu Aug 18 14:49:17 2011 -0500 @@ -106,7 +106,8 @@ # common case) or it's blocked by a non-dir node. In the # latter case, we'll ignore it in _write_pyc. pass - elif e == errno.ENOTDIR: + elif (e == errno.ENOTDIR or + sys.platform == "win32" and e == errno.ENOENT): # One of the path components was not a directory, likely # because we're in a zip file. write = False 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. From commits-noreply at bitbucket.org Thu Aug 18 22:52:09 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Thu, 18 Aug 2011 20:52:09 -0000 Subject: [py-svn] commit/pytest: hpk42: make test skipping more precise to fix a py32 test failure Message-ID: <20110818205209.13096.91708@bitbucket02.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/c93b9ee04a81/ changeset: c93b9ee04a81 user: hpk42 date: 2011-08-18 22:52:02 summary: make test skipping more precise to fix a py32 test failure affected #: 1 file (15 bytes) --- a/testing/acceptance_test.py Thu Aug 18 14:49:17 2011 -0500 +++ b/testing/acceptance_test.py Thu Aug 18 22:52:02 2011 +0200 @@ -155,7 +155,7 @@ assert result.ret != 0 assert "should be seen" in result.stdout.str() - @pytest.mark.skipif("not hasattr(os, 'symlink')") + @pytest.mark.skipif("not hasattr(py.path.local, 'mksymlinkto')") def test_chdir(self, testdir): testdir.tmpdir.join("py").mksymlinkto(py._pydir) p = testdir.tmpdir.join("main.py") 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. From commits-noreply at bitbucket.org Fri Aug 19 01:15:39 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Thu, 18 Aug 2011 23:15:39 -0000 Subject: [py-svn] commit/pytest: gutworth: factor out win32 checks Message-ID: <20110818231539.27975.53623@bitbucket02.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/c5de7cc58622/ changeset: c5de7cc58622 user: gutworth date: 2011-08-19 01:15:30 summary: factor out win32 checks affected #: 1 file (60 bytes) --- a/_pytest/assertion/rewrite.py Thu Aug 18 22:52:02 2011 +0200 +++ b/_pytest/assertion/rewrite.py Thu Aug 18 18:15:30 2011 -0500 @@ -15,6 +15,12 @@ from _pytest.assertion import util +# Windows gives ENOENT in places *nix gives ENOTDIR. +if sys.platform.startswith("win"): + PATH_COMPONENT_NOT_DIR = errno.ENOENT +else: + PATH_COMPONENT_NOT_DIR = errno.ENOTDIR + # py.test caches rewritten pycs in __pycache__. if hasattr(imp, "get_tag"): PYTEST_TAG = imp.get_tag() + "-PYTEST" @@ -106,8 +112,7 @@ # common case) or it's blocked by a non-dir node. In the # latter case, we'll ignore it in _write_pyc. pass - elif (e == errno.ENOTDIR or - sys.platform == "win32" and e == errno.ENOENT): + elif e == PATH_COMPONENT_NOT_DIR: # One of the path components was not a directory, likely # because we're in a zip file. write = False @@ -160,8 +165,7 @@ fp = open(pyc, "wb") except IOError: err = sys.exc_info()[1].errno - if (err == errno.ENOTDIR or - sys.platform == "win32" and err == errno.ENOENT): + if err == PATH_COMPONENT_NOT_DIR: # This happens when we get a EEXIST in find_module creating the # __pycache__ directory and __pycache__ is by some non-dir node. return False 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. From commits-noreply at bitbucket.org Fri Aug 19 18:08:07 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Fri, 19 Aug 2011 16:08:07 -0000 Subject: [py-svn] commit/pytest: 3 new changesets Message-ID: <20110819160807.12693.79047@bitbucket03.managed.contegix.com> 3 new changesets in pytest: http://bitbucket.org/hpk42/pytest/changeset/4fe8f195ca70/ changeset: 4fe8f195ca70 user: hpk42 date: 2011-08-19 07:58:50 summary: bump version number, refine goodpractises wrt to importing test modules affected #: 4 files (639 bytes) --- a/CHANGELOG Thu Aug 18 22:52:02 2011 +0200 +++ b/CHANGELOG Fri Aug 19 07:58:50 2011 +0200 @@ -1,4 +1,4 @@ -Changes between 2.1.0 and 2.1.1.DEV +Changes between 2.1.0 and 2.1.1 ---------------------------------------------- - fix error conditions involving the creation of __pycache__ --- a/_pytest/__init__.py Thu Aug 18 22:52:02 2011 +0200 +++ b/_pytest/__init__.py Fri Aug 19 07:58:50 2011 +0200 @@ -1,2 +1,2 @@ # -__version__ = '2.1.1.dev4' +__version__ = '2.1.1.dev5' --- a/doc/goodpractises.txt Thu Aug 18 22:52:02 2011 +0200 +++ b/doc/goodpractises.txt Fri Aug 19 07:58:50 2011 +0200 @@ -53,7 +53,7 @@ Integrating with distutils / ``python setup.py test`` -------------------------------------------------------- -You can easily integrate test runs into your distutils or +You can integrate test runs into your distutils or setuptools based project. Use the `genscript method`_ to generate a standalone py.test script:: @@ -106,9 +106,9 @@ * ``Test`` prefixed test classes (without an ``__init__`` method) * ``test_`` prefixed test functions or methods are test items -For examples of how to cnd cusotmize your test discovery :doc:`example/pythoncollection`. +For examples of how to customize your test discovery :doc:`example/pythoncollection`. -py.test additionally discovers tests using the standard +Within Python modules, py.test also discovers tests using the standard :ref:`unittest.TestCase ` subclassing technique. Choosing a test layout / import rules @@ -138,7 +138,10 @@ test_app.py ... -You can always run your tests by pointing to it:: +In both cases you usually need to make sure that ``mypkg`` is importable, +for example by using the setuptools ``python setup.py develop`` method. + +You can run your tests by pointing to it:: py.test tests/test_app.py # for external test dirs py.test mypkg/test/test_app.py # for inlined test dirs @@ -150,18 +153,27 @@ .. note:: - Test modules are imported under their fully qualified name as follows: + If py.test finds a "a/b/test_module.py" test file while + recursing into the filesystem it determines the import name + as follows: * find ``basedir`` -- this is the first "upward" (towards the root) - directory not containing an ``__init__.py`` + directory not containing an ``__init__.py``. If both the ``a`` + and ``b`` directories contain an ``__init__.py`` the basedir will + be the parent dir of ``a``. - * perform ``sys.path.insert(0, basedir)`` to make the fully - qualified test module path importable. + * perform ``sys.path.insert(0, basedir)`` to make the test module + importable under the fully qualified import name. - * ``import path.to.test_module`` where the path is determined - by converting path separators into "." files. This means + * ``import a.b.test_module`` where the path is determined + by converting path separators ``/`` into "." characters. This means you must follow the convention of having directory and file - names map to the import names. + names map directly to the import names. + + The reason for this somewhat evolved importing technique is + that in larger projects multiple test modules might import + from each other and thus deriving a canonical import name helps + to avoid surprises such as a test modules getting imported twice. .. include:: links.inc --- a/setup.py Thu Aug 18 22:52:02 2011 +0200 +++ b/setup.py Fri Aug 19 07:58:50 2011 +0200 @@ -24,7 +24,7 @@ name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.1.1.dev4', + version='2.1.1.dev5', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], http://bitbucket.org/hpk42/pytest/changeset/6c76059864ff/ changeset: 6c76059864ff user: hpk42 date: 2011-08-19 18:07:39 summary: merge affected #: 1 file (60 bytes) --- a/_pytest/assertion/rewrite.py Fri Aug 19 07:58:50 2011 +0200 +++ b/_pytest/assertion/rewrite.py Fri Aug 19 18:07:39 2011 +0200 @@ -15,6 +15,12 @@ from _pytest.assertion import util +# Windows gives ENOENT in places *nix gives ENOTDIR. +if sys.platform.startswith("win"): + PATH_COMPONENT_NOT_DIR = errno.ENOENT +else: + PATH_COMPONENT_NOT_DIR = errno.ENOTDIR + # py.test caches rewritten pycs in __pycache__. if hasattr(imp, "get_tag"): PYTEST_TAG = imp.get_tag() + "-PYTEST" @@ -106,8 +112,7 @@ # common case) or it's blocked by a non-dir node. In the # latter case, we'll ignore it in _write_pyc. pass - elif (e == errno.ENOTDIR or - sys.platform == "win32" and e == errno.ENOENT): + elif e == PATH_COMPONENT_NOT_DIR: # One of the path components was not a directory, likely # because we're in a zip file. write = False @@ -160,8 +165,7 @@ fp = open(pyc, "wb") except IOError: err = sys.exc_info()[1].errno - if (err == errno.ENOTDIR or - sys.platform == "win32" and err == errno.ENOENT): + if err == PATH_COMPONENT_NOT_DIR: # This happens when we get a EEXIST in find_module creating the # __pycache__ directory and __pycache__ is by some non-dir node. return False http://bitbucket.org/hpk42/pytest/changeset/e84d2d438b1a/ changeset: e84d2d438b1a user: hpk42 date: 2011-08-19 18:06:46 summary: adding issue numbers to the CHANGELOG affected #: 1 file (111 bytes) --- a/CHANGELOG Fri Aug 19 18:07:39 2011 +0200 +++ b/CHANGELOG Fri Aug 19 18:06:46 2011 +0200 @@ -1,13 +1,14 @@ Changes between 2.1.0 and 2.1.1 ---------------------------------------------- -- fix error conditions involving the creation of __pycache__ -- fix assertion rewriting on inserts involving strings containing '%' +- fix issue64 / pytest.set_trace now works within pytest_generate_tests hooks +- fix issue60 / fix error conditions involving the creation of __pycache__ +- fix issue63 / assertion rewriting on inserts involving strings containing '%' - fix assertion rewriting on calls with a ** arg - don't cache rewritten modules if bytecode generation is disabled - fix assertion rewriting in read-only directories - fix issue59: provide system-out/err tags for junitxml output -- fix assertion rewriting on boolean operations with 3 or more operands +- fix issue61: assertion rewriting on boolean operations with 3 or more operands - you can now build a man page with "cd doc ; make man" Changes between 2.0.3 and 2.1.0.DEV 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. From commits-noreply at bitbucket.org Fri Aug 19 19:26:02 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Fri, 19 Aug 2011 17:26:02 -0000 Subject: [py-svn] commit/pytest: hpk42: jython-2.5.2 has a core bug preventing pytest to run :( Message-ID: <20110819172602.12693.62198@bitbucket03.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/5cfba874ffad/ changeset: 5cfba874ffad user: hpk42 date: 2011-08-19 19:25:52 summary: jython-2.5.2 has a core bug preventing pytest to run :( affected #: 2 files (121 bytes) --- a/doc/index.txt Fri Aug 19 18:06:46 2011 +0200 +++ b/doc/index.txt Fri Aug 19 19:25:52 2011 +0200 @@ -5,7 +5,7 @@ - **a mature full-featured testing tool** - - runs on Posix/Windows, Python 2.4-3.2, PyPy and Jython + - runs on Posix/Windows, Python 2.4-3.2, PyPy and Jython-2.5.1 - :ref:`comprehensive online ` and `PDF documentation `_ - continuously `tested on many Python interpreters `_ - used in :ref:`many projects and organisations `, in test --- a/testing/conftest.py Fri Aug 19 18:06:46 2011 +0200 +++ b/testing/conftest.py Fri Aug 19 19:25:52 2011 +0200 @@ -53,7 +53,7 @@ metafunc.addcall(funcargs={name: val}) elif 'anypython' in metafunc.funcargnames: for name in ('python2.4', 'python2.5', 'python2.6', - 'python2.7', 'python3.1', 'pypy-c', 'jython'): + 'python2.7', 'python3.1', 'pypy', 'jython'): metafunc.addcall(id=name, param=name) # XXX copied from execnet's conftest.py - needs to be merged @@ -78,6 +78,8 @@ out, err = popen.communicate() if not err or "2.5" not in err: executable = None + if "2.5.2" in err: + executable = None # http://bugs.jython.org/issue1790 cache[name] = executable return executable @@ -91,5 +93,5 @@ executable = py.path.local(executable) if executable.check(): return executable - pytest.skip("no %s found" % (name,)) + pytest.skip("no suitable %s found" % (name,)) return executable 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. From commits-noreply at bitbucket.org Sat Aug 20 17:40:17 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Sat, 20 Aug 2011 15:40:17 -0000 Subject: [py-svn] commit/py: hpk42: bump to final 1.4.5 Message-ID: <20110820154017.29984.66595@bitbucket03.managed.contegix.com> 1 new changeset in py: http://bitbucket.org/hpk42/py/changeset/07ca410dedff/ changeset: 07ca410dedff user: hpk42 date: 2011-08-20 17:29:21 summary: bump to final 1.4.5 affected #: 3 files (15 bytes) --- a/CHANGELOG Tue Jul 12 19:48:31 2011 +0200 +++ b/CHANGELOG Sat Aug 20 17:29:21 2011 +0200 @@ -1,4 +1,4 @@ -Changes between 1.4.4 and 1.4.5.dev1 +Changes between 1.4.4 and 1.4.5 ================================================== - improve some unicode handling in terminalwriter and capturing --- a/py/__init__.py Tue Jul 12 19:48:31 2011 +0200 +++ b/py/__init__.py Sat Aug 20 17:29:21 2011 +0200 @@ -8,7 +8,7 @@ (c) Holger Krekel and others, 2004-2010 """ -__version__ = '1.4.5.dev1' +__version__ = '1.4.5' from py import _apipkg --- a/setup.py Tue Jul 12 19:48:31 2011 +0200 +++ b/setup.py Sat Aug 20 17:29:21 2011 +0200 @@ -12,7 +12,7 @@ name='py', description='library with cross-python path, ini-parsing, io, code, log facilities', long_description = open('README.txt').read(), - version='1.4.5.dev1', + version='1.4.5', url='http://pylib.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], Repository URL: https://bitbucket.org/hpk42/py/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. From commits-noreply at bitbucket.org Sat Aug 20 18:37:26 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Sat, 20 Aug 2011 16:37:26 -0000 Subject: [py-svn] commit/pytest: hpk42: bump to 2.1.1, regen examples, add release announcement Message-ID: <20110820163726.13973.56940@bitbucket01.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/283d0c74d633/ changeset: 283d0c74d633 user: hpk42 date: 2011-08-20 18:37:00 summary: bump to 2.1.1, regen examples, add release announcement affected #: 22 files (711 bytes) --- a/_pytest/__init__.py Fri Aug 19 19:25:52 2011 +0200 +++ b/_pytest/__init__.py Sat Aug 20 18:37:00 2011 +0200 @@ -1,2 +1,2 @@ # -__version__ = '2.1.1.dev5' +__version__ = '2.1.1' --- a/doc/announce/index.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/announce/index.txt Sat Aug 20 18:37:00 2011 +0200 @@ -5,6 +5,7 @@ .. toctree:: :maxdepth: 2 + release-2.1.1 release-2.1.0 release-2.0.3 release-2.0.2 --- a/doc/assert.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/assert.txt Sat Aug 20 18:37:00 2011 +0200 @@ -22,14 +22,14 @@ you will see the return value of the function call:: $ py.test test_assert1.py - ============================= test session starts ============================== - platform linux2 -- Python 2.6.6 -- pytest-2.1.0.dev6 + =========================== test session starts ============================ + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 1 items test_assert1.py F - =================================== FAILURES =================================== - ________________________________ test_function _________________________________ + ================================= FAILURES ================================= + ______________________________ test_function _______________________________ def test_function(): > assert f() == 4 @@ -37,7 +37,7 @@ E + where 3 = f() test_assert1.py:5: AssertionError - =========================== 1 failed in 0.01 seconds =========================== + ========================= 1 failed in 0.01 seconds ========================= py.test has support for showing the values of the most common subexpressions including calls, attributes, comparisons, and binary and unary @@ -104,14 +104,14 @@ if you run this module:: $ py.test test_assert2.py - ============================= test session starts ============================== - platform linux2 -- Python 2.6.6 -- pytest-2.1.0.dev6 + =========================== test session starts ============================ + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 1 items test_assert2.py F - =================================== FAILURES =================================== - _____________________________ test_set_comparison ______________________________ + ================================= FAILURES ================================= + ___________________________ test_set_comparison ____________________________ def test_set_comparison(): set1 = set("1308") @@ -124,7 +124,7 @@ E '5' test_assert2.py:5: AssertionError - =========================== 1 failed in 0.01 seconds =========================== + ========================= 1 failed in 0.01 seconds ========================= Special comparisons are done for a number of cases: @@ -170,8 +170,8 @@ $ py.test -q test_foocompare.py collecting ... collected 1 items F - =================================== FAILURES =================================== - _________________________________ test_compare _________________________________ + ================================= FAILURES ================================= + _______________________________ test_compare _______________________________ def test_compare(): f1 = Foo(1) --- a/doc/builtin.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/builtin.txt Sat Aug 20 18:37:00 2011 +0200 @@ -24,6 +24,9 @@ :ref:`function arguments ` by typing:: $ py.test --funcargs + =========================== test session starts ============================ + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + collected 0 items pytestconfig the pytest config object with access to command line opts. capsys @@ -69,3 +72,5 @@ See http://docs.python.org/library/warnings.html for information on warning categories. + + ============================= in 0.00 seconds ============================= --- a/doc/capture.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/capture.txt Sat Aug 20 18:37:00 2011 +0200 @@ -64,7 +64,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 2 items test_module.py .F @@ -78,8 +78,8 @@ test_module.py:9: AssertionError ----------------------------- Captured stdout ------------------------------ - setting up - ==================== 1 failed, 1 passed in 0.02 seconds ==================== + setting up + ==================== 1 failed, 1 passed in 0.01 seconds ==================== Accessing captured output from a test function --------------------------------------------------- --- a/doc/doctest.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/doctest.txt Sat Aug 20 18:37:00 2011 +0200 @@ -44,9 +44,9 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 1 items mymodule.py . - ========================= 1 passed in 0.40 seconds ========================= + ========================= 1 passed in 0.02 seconds ========================= --- a/doc/example/mysetup.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/example/mysetup.txt Sat Aug 20 18:37:00 2011 +0200 @@ -49,7 +49,7 @@ $ py.test test_sample.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 1 items test_sample.py F @@ -57,7 +57,7 @@ ================================= FAILURES ================================= _______________________________ test_answer ________________________________ - mysetup = + mysetup = def test_answer(mysetup): app = mysetup.myapp() @@ -66,7 +66,7 @@ E assert 54 == 42 test_sample.py:4: AssertionError - ========================= 1 failed in 0.02 seconds ========================= + ========================= 1 failed in 0.01 seconds ========================= This means that our ``mysetup`` object was successfully instantiated and ``mysetup.app()`` returned an initialized ``MyApp`` instance. @@ -122,12 +122,12 @@ $ py.test test_ssh.py -rs =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 1 items test_ssh.py s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-37/conftest.py:22: specify ssh host with --ssh + SKIP [1] /tmp/doc-exec-296/conftest.py:22: specify ssh host with --ssh ======================== 1 skipped in 0.01 seconds ========================= --- a/doc/example/nonpython.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/example/nonpython.txt Sat Aug 20 18:37:00 2011 +0200 @@ -27,7 +27,7 @@ nonpython $ py.test test_simple.yml =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 2 items test_simple.yml .F @@ -37,7 +37,7 @@ usecase execution failed spec failed: 'some': 'other' no further details known at this point. - ==================== 1 failed, 1 passed in 0.24 seconds ==================== + ==================== 1 failed, 1 passed in 0.07 seconds ==================== You get one dot for the passing ``sub1: sub1`` check and one failure. Obviously in the above ``conftest.py`` you'll want to implement a more @@ -56,7 +56,7 @@ nonpython $ py.test -v =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 -- /home/hpk/venv/0/bin/python + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 -- /home/hpk/venv/0/bin/python collecting ... collected 2 items test_simple.yml:1: usecase: ok PASSED @@ -67,17 +67,17 @@ usecase execution failed spec failed: 'some': 'other' no further details known at this point. - ==================== 1 failed, 1 passed in 0.07 seconds ==================== + ==================== 1 failed, 1 passed in 0.06 seconds ==================== While developing your custom test collection and execution it's also interesting to just look at the collection tree:: nonpython $ py.test --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 2 items - ============================= in 0.07 seconds ============================= + ============================= in 0.06 seconds ============================= --- a/doc/example/parametrize.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/example/parametrize.txt Sat Aug 20 18:37:00 2011 +0200 @@ -62,7 +62,7 @@ E assert 4 < 4 test_compute.py:3: AssertionError - 1 failed, 4 passed in 0.03 seconds + 1 failed, 4 passed in 0.01 seconds As expected when running the full range of ``param1`` values we'll get an error on the last one. @@ -114,13 +114,13 @@ $ py.test test_backends.py --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 2 items - ============================= in 0.01 seconds ============================= + ============================= in 0.00 seconds ============================= And then when we run the test:: @@ -130,7 +130,7 @@ ================================= FAILURES ================================= __________________________ test_db_initialized[1] __________________________ - db = + db = def test_db_initialized(db): # a dummy test @@ -139,7 +139,7 @@ E Failed: deliberately failing for demo purposes test_backends.py:6: Failed - 1 failed, 1 passed in 0.03 seconds + 1 failed, 1 passed in 0.01 seconds Now you see that one invocation of the test passes and another fails, as it to be expected. @@ -184,7 +184,7 @@ ================================= FAILURES ================================= __________________________ test_db_initialized[1] __________________________ - db = + db = def test_db_initialized(db): # a dummy test @@ -195,7 +195,7 @@ test_backends.py:6: Failed _________________________ TestClass.test_equals[0] _________________________ - self = , a = 1, b = 2 + self = , a = 1, b = 2 def test_equals(self, a, b): > assert a == b @@ -204,14 +204,14 @@ test_parametrize.py:17: AssertionError ______________________ TestClass.test_zerodivision[1] ______________________ - self = , a = 3, b = 2 + self = , a = 3, b = 2 def test_zerodivision(self, a, b): > pytest.raises(ZeroDivisionError, "a/b") E Failed: DID NOT RAISE test_parametrize.py:20: Failed - 3 failed, 3 passed in 0.05 seconds + 3 failed, 3 passed in 0.02 seconds Parametrizing test methods through a decorator -------------------------------------------------------------- @@ -252,7 +252,7 @@ ================================= FAILURES ================================= _________________________ TestClass.test_equals[0] _________________________ - self = , a = 1, b = 2 + self = , a = 1, b = 2 @params([dict(a=1, b=2), dict(a=3, b=3), ]) def test_equals(self, a, b): @@ -262,7 +262,7 @@ test_parametrize2.py:19: AssertionError ______________________ TestClass.test_zerodivision[1] ______________________ - self = , a = 3, b = 2 + self = , a = 3, b = 2 @params([dict(a=1, b=0), dict(a=3, b=2)]) def test_zerodivision(self, a, b): @@ -270,7 +270,7 @@ E Failed: DID NOT RAISE test_parametrize2.py:23: Failed - 2 failed, 2 passed in 0.03 seconds + 2 failed, 2 passed in 0.02 seconds checking serialization between Python interpreters -------------------------------------------------------------- @@ -291,4 +291,4 @@ . $ py.test -q multipython.py collecting ... collected 75 items ....s....s....s....ssssss....s....s....s....ssssss....s....s....s....ssssss - 48 passed, 27 skipped in 2.04 seconds + 48 passed, 27 skipped in 2.48 seconds --- a/doc/example/pythoncollection.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/example/pythoncollection.txt Sat Aug 20 18:37:00 2011 +0200 @@ -43,7 +43,7 @@ $ py.test --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 2 items @@ -82,7 +82,7 @@ . $ py.test --collectonly pythoncollection.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 3 items --- a/doc/example/reportingdemo.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/example/reportingdemo.txt Sat Aug 20 18:37:00 2011 +0200 @@ -13,7 +13,7 @@ assertion $ py.test failure_demo.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 39 items failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF @@ -30,7 +30,7 @@ failure_demo.py:15: AssertionError _________________________ TestFailing.test_simple __________________________ - self = + self = def test_simple(self): def f(): @@ -40,13 +40,13 @@ > assert f() == g() E assert 42 == 43 - E + where 42 = () - E + and 43 = () + E + where 42 = () + E + and 43 = () failure_demo.py:28: AssertionError ____________________ TestFailing.test_simple_multiline _____________________ - self = + self = def test_simple_multiline(self): otherfunc_multi( @@ -59,26 +59,26 @@ a = 42, b = 54 def otherfunc_multi(a,b): - assert (a == - > b) + > assert (a == + b) E assert 42 == 54 - failure_demo.py:12: AssertionError + failure_demo.py:11: AssertionError ___________________________ TestFailing.test_not ___________________________ - self = + self = def test_not(self): def f(): return 42 > assert not f() E assert not 42 - E + where 42 = () + E + where 42 = () failure_demo.py:38: AssertionError _________________ TestSpecialisedExplanations.test_eq_text _________________ - self = + self = def test_eq_text(self): > assert 'spam' == 'eggs' @@ -89,7 +89,7 @@ failure_demo.py:42: AssertionError _____________ TestSpecialisedExplanations.test_eq_similar_text _____________ - self = + self = def test_eq_similar_text(self): > assert 'foo 1 bar' == 'foo 2 bar' @@ -102,7 +102,7 @@ failure_demo.py:45: AssertionError ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________ - self = + self = def test_eq_multiline_text(self): > assert 'foo\nspam\nbar' == 'foo\neggs\nbar' @@ -115,7 +115,7 @@ failure_demo.py:48: AssertionError ______________ TestSpecialisedExplanations.test_eq_long_text _______________ - self = + self = def test_eq_long_text(self): a = '1'*100 + 'a' + '2'*100 @@ -132,7 +132,7 @@ failure_demo.py:53: AssertionError _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________ - self = + self = def test_eq_long_text_multiline(self): a = '1\n'*100 + 'a' + '2\n'*100 @@ -156,7 +156,7 @@ failure_demo.py:58: AssertionError _________________ TestSpecialisedExplanations.test_eq_list _________________ - self = + self = def test_eq_list(self): > assert [0, 1, 2] == [0, 1, 3] @@ -166,7 +166,7 @@ failure_demo.py:61: AssertionError ______________ TestSpecialisedExplanations.test_eq_list_long _______________ - self = + self = def test_eq_list_long(self): a = [0]*100 + [1] + [3]*100 @@ -178,7 +178,7 @@ failure_demo.py:66: AssertionError _________________ TestSpecialisedExplanations.test_eq_dict _________________ - self = + self = def test_eq_dict(self): > assert {'a': 0, 'b': 1} == {'a': 0, 'b': 2} @@ -191,7 +191,7 @@ failure_demo.py:69: AssertionError _________________ TestSpecialisedExplanations.test_eq_set __________________ - self = + self = def test_eq_set(self): > assert set([0, 10, 11, 12]) == set([0, 20, 21]) @@ -207,7 +207,7 @@ failure_demo.py:72: AssertionError _____________ TestSpecialisedExplanations.test_eq_longer_list ______________ - self = + self = def test_eq_longer_list(self): > assert [1,2] == [1,2,3] @@ -217,7 +217,7 @@ failure_demo.py:75: AssertionError _________________ TestSpecialisedExplanations.test_in_list _________________ - self = + self = def test_in_list(self): > assert 1 in [0, 2, 3, 4, 5] @@ -226,7 +226,7 @@ failure_demo.py:78: AssertionError __________ TestSpecialisedExplanations.test_not_in_text_multiline __________ - self = + self = def test_not_in_text_multiline(self): text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail' @@ -244,7 +244,7 @@ failure_demo.py:82: AssertionError ___________ TestSpecialisedExplanations.test_not_in_text_single ____________ - self = + self = def test_not_in_text_single(self): text = 'single foo line' @@ -257,7 +257,7 @@ failure_demo.py:86: AssertionError _________ TestSpecialisedExplanations.test_not_in_text_single_long _________ - self = + self = def test_not_in_text_single_long(self): text = 'head ' * 50 + 'foo ' + 'tail ' * 20 @@ -270,7 +270,7 @@ failure_demo.py:90: AssertionError ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______ - self = + self = def test_not_in_text_single_long_term(self): text = 'head ' * 50 + 'f'*70 + 'tail ' * 20 @@ -289,7 +289,7 @@ i = Foo() > assert i.b == 2 E assert 1 == 2 - E + where 1 = .b + E + where 1 = .b failure_demo.py:101: AssertionError _________________________ test_attribute_instance __________________________ @@ -299,8 +299,8 @@ b = 1 > assert Foo().b == 2 E assert 1 == 2 - E + where 1 = .b - E + where = () + E + where 1 = .b + E + where = () failure_demo.py:107: AssertionError __________________________ test_attribute_failure __________________________ @@ -316,7 +316,7 @@ failure_demo.py:116: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - self = + self = def _get_b(self): > raise Exception('Failed to get attrib') @@ -332,15 +332,15 @@ b = 2 > assert Foo().b == Bar().b E assert 1 == 2 - E + where 1 = .b - E + where = () - E + and 2 = .b - E + where = () + E + where 1 = .b + E + where = () + E + and 2 = .b + E + where = () failure_demo.py:124: AssertionError __________________________ TestRaises.test_raises __________________________ - self = + self = def test_raises(self): s = 'qwe' @@ -352,10 +352,10 @@ > int(s) E ValueError: invalid literal for int() with base 10: 'qwe' - <0-codegen /home/hpk/p/pytest/_pytest/python.py:831>:1: ValueError + <0-codegen /home/hpk/p/pytest/_pytest/python.py:833>:1: ValueError ______________________ TestRaises.test_raises_doesnt _______________________ - self = + self = def test_raises_doesnt(self): > raises(IOError, "int('3')") @@ -364,7 +364,7 @@ failure_demo.py:136: Failed __________________________ TestRaises.test_raise ___________________________ - self = + self = def test_raise(self): > raise ValueError("demo error") @@ -373,7 +373,7 @@ failure_demo.py:139: ValueError ________________________ TestRaises.test_tupleerror ________________________ - self = + self = def test_tupleerror(self): > a,b = [1] @@ -382,7 +382,7 @@ failure_demo.py:142: ValueError ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______ - self = + self = def test_reinterpret_fails_with_print_for_the_fun_of_it(self): l = [1,2,3] @@ -395,7 +395,7 @@ l is [1, 2, 3] ________________________ TestRaises.test_some_error ________________________ - self = + self = def test_some_error(self): > if namenotexi: @@ -423,7 +423,7 @@ <2-codegen 'abc-123' /home/hpk/p/pytest/doc/example/assertion/failure_demo.py:162>:2: AssertionError ____________________ TestMoreErrors.test_complex_error _____________________ - self = + self = def test_complex_error(self): def f(): @@ -452,7 +452,7 @@ failure_demo.py:5: AssertionError ___________________ TestMoreErrors.test_z1_unpack_error ____________________ - self = + self = def test_z1_unpack_error(self): l = [] @@ -462,7 +462,7 @@ failure_demo.py:179: ValueError ____________________ TestMoreErrors.test_z2_type_error _____________________ - self = + self = def test_z2_type_error(self): l = 3 @@ -472,20 +472,19 @@ failure_demo.py:183: TypeError ______________________ TestMoreErrors.test_startswith ______________________ - self = + self = def test_startswith(self): s = "123" g = "456" > assert s.startswith(g) - E assert False - E + where False = ('456') - E + where = '123'.startswith + E assert ('456') + E + where = '123'.startswith failure_demo.py:188: AssertionError __________________ TestMoreErrors.test_startswith_nested ___________________ - self = + self = def test_startswith_nested(self): def f(): @@ -493,39 +492,36 @@ def g(): return "456" > assert f().startswith(g()) - E assert False - E + where False = ('456') - E + where = '123'.startswith - E + where '123' = () - E + and '456' = () + E assert ('456') + E + where = '123'.startswith + E + where '123' = () + E + and '456' = () failure_demo.py:195: AssertionError _____________________ TestMoreErrors.test_global_func ______________________ - self = + self = def test_global_func(self): > assert isinstance(globf(42), float) - E assert False - E + where False = isinstance(43, float) - E + where 43 = globf(42) + E assert isinstance(43, float) + E + where 43 = globf(42) failure_demo.py:198: AssertionError _______________________ TestMoreErrors.test_instance _______________________ - self = + self = def test_instance(self): self.x = 6*7 > assert self.x != 42 E assert 42 != 42 - E + where 42 = 42 - E + where 42 = .x + E + where 42 = .x failure_demo.py:202: AssertionError _______________________ TestMoreErrors.test_compare ________________________ - self = + self = def test_compare(self): > assert globf(10) < 5 @@ -535,7 +531,7 @@ failure_demo.py:205: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ - self = + self = def test_try_finally(self): x = 1 @@ -544,4 +540,4 @@ E assert 1 == 0 failure_demo.py:210: AssertionError - ======================== 39 failed in 0.23 seconds ========================= + ======================== 39 failed in 0.20 seconds ========================= --- a/doc/example/simple.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/example/simple.txt Sat Aug 20 18:37:00 2011 +0200 @@ -53,7 +53,7 @@ test_sample.py:6: AssertionError ----------------------------- Captured stdout ------------------------------ first - 1 failed in 0.03 seconds + 1 failed in 0.01 seconds And now with supplying a command line option:: @@ -76,7 +76,7 @@ test_sample.py:6: AssertionError ----------------------------- Captured stdout ------------------------------ second - 1 failed in 0.02 seconds + 1 failed in 0.01 seconds Ok, this completes the basic pattern. However, one often rather wants to process command line options outside of the test and @@ -109,13 +109,13 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 - gw0 I / gw1 I / gw2 I / gw3 I - gw0 [0] / gw1 [0] / gw2 [0] / gw3 [0] + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + gw0 I / gw1 I + gw0 [0] / gw1 [0] scheduling tests via LoadScheduling - ============================= in 0.52 seconds ============================= + ============================= in 0.26 seconds ============================= .. _`excontrolskip`: @@ -156,12 +156,12 @@ $ py.test -rs # "-rs" means report details on the little 's' =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-42/conftest.py:9: need --runslow option to run + SKIP [1] /tmp/doc-exec-301/conftest.py:9: need --runslow option to run =================== 1 passed, 1 skipped in 0.01 seconds ==================== @@ -169,7 +169,7 @@ $ py.test --runslow =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 2 items test_module.py .. @@ -213,7 +213,7 @@ E Failed: not configured: 42 test_checkconfig.py:8: Failed - 1 failed in 0.02 seconds + 1 failed in 0.01 seconds Detect if running from within a py.test run -------------------------------------------------------------- @@ -261,7 +261,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 project deps: mylib-1.1 collecting ... collected 0 items @@ -284,7 +284,7 @@ $ py.test -v =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 -- /home/hpk/venv/0/bin/python + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 -- /home/hpk/venv/0/bin/python info1: did you know that ... did you? collecting ... collected 0 items @@ -295,7 +295,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 0 items ============================= in 0.00 seconds ============================= --- a/doc/funcargs.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/funcargs.txt Sat Aug 20 18:37:00 2011 +0200 @@ -61,7 +61,7 @@ $ py.test test_simplefactory.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 1 items test_simplefactory.py F @@ -76,7 +76,7 @@ E assert 42 == 17 test_simplefactory.py:5: AssertionError - ========================= 1 failed in 0.02 seconds ========================= + ========================= 1 failed in 0.01 seconds ========================= This means that indeed the test function was called with a ``myfuncarg`` argument value of ``42`` and the assert fails. Here is how py.test @@ -167,7 +167,7 @@ $ py.test test_example.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 10 items test_example.py .........F @@ -182,7 +182,7 @@ E assert 9 < 9 test_example.py:7: AssertionError - ==================== 1 failed, 9 passed in 0.03 seconds ==================== + ==================== 1 failed, 9 passed in 0.02 seconds ==================== Note that the ``pytest_generate_tests(metafunc)`` hook is called during the test collection phase which is separate from the actual test running. @@ -190,7 +190,7 @@ $ py.test --collectonly test_example.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 10 items @@ -210,7 +210,7 @@ $ py.test -v -k 7 test_example.py # or -k test_func[7] =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 -- /home/hpk/venv/0/bin/python + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 -- /home/hpk/venv/0/bin/python collecting ... collected 10 items test_example.py:6: test_func[7] PASSED --- a/doc/getting-started.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/getting-started.txt Sat Aug 20 18:37:00 2011 +0200 @@ -22,10 +22,9 @@ To check your installation has installed the correct version:: $ py.test --version - This is py.test version 2.0.3, imported from /home/hpk/p/pytest/pytest.pyc + This is py.test version 2.1.1, imported from /home/hpk/p/pytest/pytest.py setuptools registered plugins: - pytest-xdist-1.6.dev3 at /home/hpk/p/pytest-xdist/xdist/plugin.pyc - pytest-incremental-0.1.0 at /home/hpk/venv/0/lib/python2.6/site-packages/pytest_incremental.pyc + pytest-xdist-1.6 at /home/hpk/p/pytest-xdist/xdist/plugin.pyc If you get an error checkout :ref:`installation issues`. @@ -47,7 +46,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 1 items test_sample.py F @@ -61,7 +60,7 @@ E + where 4 = func(3) test_sample.py:5: AssertionError - ========================= 1 failed in 0.02 seconds ========================= + ========================= 1 failed in 0.01 seconds ========================= py.test found the ``test_answer`` function by following :ref:`standard test discovery rules `, basically detecting the ``test_`` prefixes. We got a failure report because our little ``func(3)`` call did not return ``5``. @@ -96,7 +95,7 @@ $ py.test -q test_sysexit.py collecting ... collected 1 items . - 1 passed in 0.01 seconds + 1 passed in 0.00 seconds .. todo:: For further ways to assert exceptions see the `raises` @@ -127,16 +126,15 @@ ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - self = + self = def test_two(self): x = "hello" > assert hasattr(x, 'check') - E assert False - E + where False = hasattr('hello', 'check') + E assert hasattr('hello', 'check') test_class.py:8: AssertionError - 1 failed, 1 passed in 0.03 seconds + 1 failed, 1 passed in 0.01 seconds The first test passed, the second failed. Again we can easily see the intermediate values used in the assertion, helping us to @@ -165,7 +163,7 @@ ================================= FAILURES ================================= _____________________________ test_needsfiles ______________________________ - tmpdir = local('/tmp/pytest-10/test_needsfiles0') + tmpdir = local('/tmp/pytest-60/test_needsfiles0') def test_needsfiles(tmpdir): print tmpdir @@ -174,8 +172,8 @@ test_tmpdir.py:3: AssertionError ----------------------------- Captured stdout ------------------------------ - /tmp/pytest-10/test_needsfiles0 - 1 failed in 0.13 seconds + /tmp/pytest-60/test_needsfiles0 + 1 failed in 0.02 seconds Before the test runs, a unique-per-test-invocation temporary directory was created. More info at :ref:`tmpdir handling`. --- a/doc/mark.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/mark.txt Sat Aug 20 18:37:00 2011 +0200 @@ -88,7 +88,7 @@ $ py.test -k webtest # running with the above defined examples yields =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 4 items test_mark.py .. @@ -100,7 +100,7 @@ $ py.test -k-webtest =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 4 items ===================== 4 tests deselected by '-webtest' ===================== @@ -110,7 +110,7 @@ $ py.test -kTestClass =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 4 items test_mark_classlevel.py .. --- a/doc/monkeypatch.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/monkeypatch.txt Sat Aug 20 18:37:00 2011 +0200 @@ -39,7 +39,7 @@ .. background check: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 0 items ============================= in 0.00 seconds ============================= --- a/doc/skipping.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/skipping.txt Sat Aug 20 18:37:00 2011 +0200 @@ -130,7 +130,7 @@ example $ py.test -rx xfail_demo.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 6 items xfail_demo.py xxxxxx @@ -147,7 +147,7 @@ XFAIL xfail_demo.py::test_hello6 reason: reason - ======================== 6 xfailed in 0.05 seconds ========================= + ======================== 6 xfailed in 0.03 seconds ========================= .. _`evaluation of skipif/xfail conditions`: --- a/doc/tmpdir.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/tmpdir.txt Sat Aug 20 18:37:00 2011 +0200 @@ -28,7 +28,7 @@ $ py.test test_tmpdir.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 1 items test_tmpdir.py F @@ -36,7 +36,7 @@ ================================= FAILURES ================================= _____________________________ test_create_file _____________________________ - tmpdir = local('/tmp/pytest-11/test_create_file0') + tmpdir = local('/tmp/pytest-61/test_create_file0') def test_create_file(tmpdir): p = tmpdir.mkdir("sub").join("hello.txt") @@ -47,7 +47,7 @@ E assert 0 test_tmpdir.py:7: AssertionError - ========================= 1 failed in 0.06 seconds ========================= + ========================= 1 failed in 0.03 seconds ========================= .. _`base temporary directory`: --- a/doc/unittest.txt Fri Aug 19 19:25:52 2011 +0200 +++ b/doc/unittest.txt Sat Aug 20 18:37:00 2011 +0200 @@ -24,7 +24,7 @@ $ py.test test_unittest.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.6 -- pytest-2.0.3 + platform linux2 -- Python 2.7.1 -- pytest-2.1.1 collecting ... collected 1 items test_unittest.py F --- a/setup.py Fri Aug 19 19:25:52 2011 +0200 +++ b/setup.py Sat Aug 20 18:37:00 2011 +0200 @@ -24,7 +24,7 @@ name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.1.1.dev5', + version='2.1.1', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], @@ -32,8 +32,8 @@ author_email='holger at merlinux.eu', entry_points= make_entry_points(), # the following should be enabled for release - install_requires=['py>=1.4.5.dev1'], - classifiers=['Development Status :: 5 - Production/Stable', + install_requires=['py>=1.4.5'], + classifiers=['Development Status :: 6 - Mature', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: POSIX', --- a/tox.ini Fri Aug 19 19:25:52 2011 +0200 +++ b/tox.ini Sat Aug 20 18:37:00 2011 +0200 @@ -30,9 +30,11 @@ changedir=. basepython=python2.6 deps=:pypi:twisted + :pypi:pexpect + py>=1.4.5.dev1 commands= py.test -rsxf \ - --junitxml={envlogdir}/junit-{envname}.xml [testing/test_unittest.py] + --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py} [testenv:doctest] changedir=. commands=py.test --doctest-modules _pytest @@ -70,7 +72,7 @@ [pytest] minversion=2.0 plugins=pytester -#addopts= -rxf --pyargs --doctest-modules --ignore=.tox +addopts= -rxs #--pyargs --doctest-modules --ignore=.tox rsyncdirs=tox.ini pytest.py _pytest testing python_files=test_*.py *_test.py python_classes=Test Acceptance 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. From commits-noreply at bitbucket.org Sat Aug 20 18:52:00 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Sat, 20 Aug 2011 16:52:00 -0000 Subject: [py-svn] commit/pytest: hpk42: fix announcement Message-ID: <20110820165200.29984.93147@bitbucket03.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/96f28c89f626/ changeset: 96f28c89f626 user: hpk42 date: 2011-08-20 18:51:53 summary: fix announcement affected #: 1 file (10 bytes) --- a/doc/announce/release-2.1.1.txt Sat Aug 20 18:37:00 2011 +0200 +++ b/doc/announce/release-2.1.1.txt Sat Aug 20 18:51:53 2011 +0200 @@ -6,12 +6,12 @@ http://pytest.org/ -Most bug fixes fix remaining issues with the perfected assertions introduced -with 2.1.0 - thanks to the bug reporters and to Benjamin Peterson for -helping to fix them. Also, junitxml output now produces system-out/err -tags which are shown more nicely within Jenkins environments. +Most bug fixes address remaining issues with the perfected assertions +introduced with 2.1.0 - many thanks to the bug reporters and to Benjamin +Peterson for helping to fix them. Also, junitxml output now produces +system-out/err tags which lead to better displays of tracebacks with Jenkins. -NOTE particularly to package maintainers and others interested: there now +Also a quick note to package maintainers and others interested: there now is a "pytest" man page which can be generated with "make man" in doc/. If you want to install or upgrade pytest, just type one of:: 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. From commits-noreply at bitbucket.org Mon Aug 29 16:13:07 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Mon, 29 Aug 2011 14:13:07 -0000 Subject: [py-svn] commit/pytest: 2 new changesets Message-ID: <20110829141307.18772.36649@bitbucket02.managed.contegix.com> 2 new changesets in pytest: http://bitbucket.org/hpk42/pytest/changeset/98f68176bb3a/ changeset: 98f68176bb3a user: gutworth date: 2011-08-29 16:10:00 summary: add heading for next version affected #: 1 file (83 bytes) --- a/CHANGELOG Sat Aug 20 18:51:53 2011 +0200 +++ b/CHANGELOG Mon Aug 29 10:10:00 2011 -0400 @@ -1,3 +1,6 @@ +Changes between 2.1.1 and [NEXT VERSION] +---------------------------------------- + Changes between 2.1.0 and 2.1.1 ---------------------------------------------- http://bitbucket.org/hpk42/pytest/changeset/ae1c8f42b002/ changeset: ae1c8f42b002 user: gutworth date: 2011-08-29 16:13:00 summary: use different caches for optimized and unoptimized code (fixes #66) affected #: 3 files (700 bytes) --- a/CHANGELOG Mon Aug 29 10:10:00 2011 -0400 +++ b/CHANGELOG Mon Aug 29 10:13:00 2011 -0400 @@ -1,6 +1,8 @@ Changes between 2.1.1 and [NEXT VERSION] ---------------------------------------- +- fix issue66: use different assertion rewriting caches when the -O option is passed + Changes between 2.1.0 and 2.1.1 ---------------------------------------------- --- a/_pytest/assertion/rewrite.py Mon Aug 29 10:10:00 2011 -0400 +++ b/_pytest/assertion/rewrite.py Mon Aug 29 10:13:00 2011 -0400 @@ -35,6 +35,9 @@ PYTEST_TAG = "%s-%s%s-PYTEST" % (impl, ver[0], ver[1]) del ver, impl +PYC_EXT = ".py" + "c" if __debug__ else "o" +PYC_TAIL = "." + PYTEST_TAG + PYC_EXT + class AssertionRewritingHook(object): """Import hook which rewrites asserts.""" @@ -121,7 +124,7 @@ write = False else: raise - cache_name = fn_pypath.basename[:-3] + "." + PYTEST_TAG + ".pyc" + cache_name = fn_pypath.basename[:-3] + PYC_TAIL pyc = os.path.join(cache_dir, cache_name) # Notice that even if we're in a read-only directory, I'm going to check # for a cached pyc. This may not be optimal... --- a/testing/test_assertrewrite.py Mon Aug 29 10:10:00 2011 -0400 +++ b/testing/test_assertrewrite.py Mon Aug 29 10:13:00 2011 -0400 @@ -326,3 +326,17 @@ assert not os.path.exists(os.path.dirname(__cached__))""") monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", "1") assert testdir.runpytest().ret == 0 + + def test_pyc_vs_pyo(self, testdir, monkeypatch): + testdir.makepyfile(""" +import pytest +def test_optimized(): + "hello" + assert test_optimized.__doc__ is None""") + p = py.path.local.make_numbered_dir(prefix="runpytest-", keep=None, + rootdir=testdir.tmpdir) + tmp = "--basetemp=%s" % p + monkeypatch.setenv("PYTHONOPTIMIZE", "2") + assert testdir.runpybin("py.test", tmp).ret == 0 + monkeypatch.undo() + assert testdir.runpybin("py.test", tmp).ret == 1 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. From commits-noreply at bitbucket.org Tue Aug 30 06:12:26 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Tue, 30 Aug 2011 04:12:26 -0000 Subject: [py-svn] commit/pytest: gutworth: only use the last part of the module name in the filename (fixes #68) Message-ID: <20110830041226.5364.23310@bitbucket03.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/9363a49aac8c/ changeset: 9363a49aac8c user: gutworth date: 2011-08-30 06:12:07 summary: only use the last part of the module name in the filename (fixes #68) affected #: 3 files (370 bytes) --- a/CHANGELOG Mon Aug 29 10:13:00 2011 -0400 +++ b/CHANGELOG Tue Aug 30 00:12:07 2011 -0400 @@ -1,6 +1,7 @@ Changes between 2.1.1 and [NEXT VERSION] ---------------------------------------- +- fix issue68 / packages now work with assertion rewriting - fix issue66: use different assertion rewriting caches when the -O option is passed Changes between 2.1.0 and 2.1.1 --- a/_pytest/assertion/rewrite.py Mon Aug 29 10:13:00 2011 -0400 +++ b/_pytest/assertion/rewrite.py Tue Aug 30 00:12:07 2011 -0400 @@ -77,7 +77,7 @@ # Don't know what this is. return None else: - fn = os.path.join(pth, name + ".py") + fn = os.path.join(pth, name.rpartition(".")[2] + ".py") fn_pypath = py.path.local(fn) # Is this a test file? if not sess.isinitpath(fn): --- a/testing/test_assertrewrite.py Mon Aug 29 10:13:00 2011 -0400 +++ b/testing/test_assertrewrite.py Tue Aug 30 00:12:07 2011 -0400 @@ -340,3 +340,12 @@ assert testdir.runpybin("py.test", tmp).ret == 0 monkeypatch.undo() assert testdir.runpybin("py.test", tmp).ret == 1 + + def test_package(self, testdir): + pkg = testdir.tmpdir.join("pkg") + pkg.mkdir() + pkg.join("__init__.py").ensure() + pkg.join("test_blah.py").write(""" +def test_rewritten(): + assert "@py_builtins" in globals()""") + assert testdir.runpytest().ret == 0 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. From commits-noreply at bitbucket.org Tue Aug 30 16:34:31 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Tue, 30 Aug 2011 14:34:31 -0000 Subject: [py-svn] commit/pytest: 2 new changesets Message-ID: <20110830143431.5361.76367@bitbucket03.managed.contegix.com> 2 new changesets in pytest: http://bitbucket.org/hpk42/pytest/changeset/fb6709054717/ changeset: fb6709054717 user: gutworth date: 2011-08-30 06:24:57 summary: clear instead of deleting temporary assertion variables affected #: 1 file (482 bytes) --- a/_pytest/assertion/rewrite.py Tue Aug 30 00:12:07 2011 -0400 +++ b/_pytest/assertion/rewrite.py Tue Aug 30 00:24:57 2011 -0400 @@ -374,7 +374,7 @@ """Get a new variable.""" # Use a character invalid in python identifiers to avoid clashing. name = "@py_assert" + str(next(self.variable_counter)) - self.variables[self.cond_chain].add(name) + self.variables.append(name) return name def assign(self, expr): @@ -437,7 +437,7 @@ return [assert_] self.statements = [] self.cond_chain = () - self.variables = collections.defaultdict(set) + self.variables = [] self.variable_counter = itertools.count() self.stack = [] self.on_failure = [] @@ -459,22 +459,11 @@ else: raise_ = ast.Raise(exc, None, None) body.append(raise_) - # Delete temporary variables. This requires a bit cleverness about the - # order, so we don't delete variables that are themselves conditions for - # later variables. - for chain in sorted(self.variables, key=len, reverse=True): - if chain: - where = [] - if len(chain) > 1: - cond = ast.BoolOp(ast.And(), list(chain)) - else: - cond = chain[0] - self.statements.append(ast.If(cond, where, [])) - else: - where = self.statements - v = self.variables[chain] - names = [ast.Name(name, ast.Del()) for name in v] - where.append(ast.Delete(names)) + # Clear temporary variables by setting them to None. + if self.variables: + variables = [ast.Name(name, ast.Store()) for name in self.variables] + clear = ast.Assign(variables, ast.Name("None", ast.Load())) + self.statements.append(clear) # Fix line numbers. for stmt in self.statements: set_location(stmt, assert_.lineno, assert_.col_offset) http://bitbucket.org/hpk42/pytest/changeset/6fa4598c3bc4/ changeset: 6fa4598c3bc4 user: gutworth date: 2011-08-30 16:34:21 summary: every boolop operand must have it's own format context (fixes #69) affected #: 3 files (423 bytes) --- a/CHANGELOG Tue Aug 30 00:24:57 2011 -0400 +++ b/CHANGELOG Tue Aug 30 10:34:21 2011 -0400 @@ -1,6 +1,7 @@ Changes between 2.1.1 and [NEXT VERSION] ---------------------------------------- +- fix issue69 / assertion rewriting fixed on some boolean operations - fix issue68 / packages now work with assertion rewriting - fix issue66: use different assertion rewriting caches when the -O option is passed --- a/_pytest/assertion/rewrite.py Tue Aug 30 00:24:57 2011 -0400 +++ b/_pytest/assertion/rewrite.py Tue Aug 30 10:34:21 2011 -0400 @@ -403,13 +403,6 @@ self.explanation_specifiers[specifier] = expr return "%(" + specifier + ")s" - def enter_cond(self, cond, body): - self.statements.append(ast.If(cond, body, [])) - self.cond_chain += cond, - - def leave_cond(self, n=1): - self.cond_chain = self.cond_chain[:-n] - def push_format_context(self): self.explanation_specifiers = {} self.stack.append(self.explanation_specifiers) @@ -484,24 +477,30 @@ app = ast.Attribute(expl_list, "append", ast.Load()) is_or = isinstance(boolop.op, ast.Or) body = save = self.statements + fail_save = self.on_failure levels = len(boolop.values) - 1 self.push_format_context() # Process each operand, short-circuting if needed. for i, v in enumerate(boolop.values): + self.push_format_context() res, expl = self.visit(v) body.append(ast.Assign([ast.Name(res_var, ast.Store())], res)) - call = ast.Call(app, [ast.Str(expl)], [], None, None) - body.append(ast.Expr(call)) + if i: + fail_inner = [] + self.on_failure.append(ast.If(cond, fail_inner, [])) + self.on_failure = fail_inner + expl_format = self.pop_format_context(ast.Str(expl)) + call = ast.Call(app, [expl_format], [], None, None) + self.on_failure.append(ast.Expr(call)) if i < levels: - inner = [] cond = res if is_or: cond = ast.UnaryOp(ast.Not(), cond) - self.enter_cond(cond, inner) + inner = [] + self.statements.append(ast.If(cond, inner, [])) self.statements = body = inner - # Leave all conditions. - self.leave_cond(levels) self.statements = save + self.on_failure = fail_save expl_template = self.helper("format_boolop", expl_list, ast.Num(is_or)) expl = self.pop_format_context(expl_template) return ast.Name(res_var, ast.Load()), self.explanation_param(expl) --- a/testing/test_assertrewrite.py Tue Aug 30 00:24:57 2011 -0400 +++ b/testing/test_assertrewrite.py Tue Aug 30 10:34:21 2011 -0400 @@ -133,6 +133,14 @@ f = g = False assert not f and not g getmsg(f, must_pass=True) + def x(): + return False + def f(): + assert x() and x() + assert getmsg(f, {"x" : x}) == "assert (x())" + def f(): + assert False or x() + assert getmsg(f, {"x" : x}) == "assert (False or x())" def f(): f = True g = False 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.