From commits-noreply at bitbucket.org Fri Oct 14 22:26:19 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Fri, 14 Oct 2011 20:26:19 -0000 Subject: [py-svn] commit/pytest: gutworth: put the explanation generating code in the conditional fail body (fixes #79) Message-ID: <20111014202619.11674.62209@bitbucket12.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/cd8ca99f4011/ changeset: cd8ca99f4011 user: gutworth date: 2011-10-14 22:26:13 summary: put the explanation generating code in the conditional fail body (fixes #79) affected #: 3 files (-1 bytes) --- a/CHANGELOG Thu Sep 29 23:44:26 2011 +0200 +++ b/CHANGELOG Fri Oct 14 16:26:13 2011 -0400 @@ -1,6 +1,7 @@ Changes between 2.1.2 and [next version] ---------------------------------------- +- fix issue79: rewriting failed on some comparisons in boolops - correctly handle zero length arguments (a la pytest '') - fix issue67 / junitxml now contains correct test durations, thanks ronny - fix issue75 / skipping test failure on jython --- a/_pytest/assertion/rewrite.py Thu Sep 29 23:44:26 2011 +0200 +++ b/_pytest/assertion/rewrite.py Fri Oct 14 16:26:13 2011 -0400 @@ -491,13 +491,13 @@ 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)) if i: fail_inner = [] self.on_failure.append(ast.If(cond, fail_inner, [])) self.on_failure = fail_inner + self.push_format_context() + res, expl = self.visit(v) + body.append(ast.Assign([ast.Name(res_var, ast.Store())], res)) expl_format = self.pop_format_context(ast.Str(expl)) call = ast.Call(app, [expl_format], [], None, None) self.on_failure.append(ast.Expr(call)) --- a/testing/test_assertrewrite.py Thu Sep 29 23:44:26 2011 +0200 +++ b/testing/test_assertrewrite.py Fri Oct 14 16:26:13 2011 -0400 @@ -145,6 +145,14 @@ assert False or x() assert getmsg(f, {"x" : x}) == "assert (False or x())" def f(): + assert 1 in {} and 2 in {} + assert getmsg(f) == "assert (1 in {})" + def f(): + x = 1 + y = 2 + assert x in {1 : None} and y in {} + assert getmsg(f) == "assert (1 in {1: None} and 2 in {})" + def f(): f = True g = False assert f or g 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 Oct 15 00:08:16 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Fri, 14 Oct 2011 22:08:16 -0000 Subject: [py-svn] commit/pytest: gutworth: cast boolean thing to int to make py3.3 happy Message-ID: <20111014220816.6543.82138@bitbucket02.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/6e6064578fcf/ changeset: 6e6064578fcf user: gutworth date: 2011-10-15 00:08:10 summary: cast boolean thing to int to make py3.3 happy affected #: 1 file (-1 bytes) --- a/_pytest/assertion/rewrite.py Fri Oct 14 16:26:13 2011 -0400 +++ b/_pytest/assertion/rewrite.py Fri Oct 14 18:08:10 2011 -0400 @@ -484,7 +484,7 @@ res_var = self.variable() expl_list = self.assign(ast.List([], ast.Load())) app = ast.Attribute(expl_list, "append", ast.Load()) - is_or = isinstance(boolop.op, ast.Or) + is_or = int(isinstance(boolop.op, ast.Or)) body = save = self.statements fail_save = self.on_failure levels = len(boolop.values) - 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 Sun Oct 16 12:51:56 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Sun, 16 Oct 2011 10:51:56 -0000 Subject: [py-svn] commit/pytest: flub: Look up the pytest_assertrepr_compare hook for each test item Message-ID: <20111016105156.27870.9764@bitbucket03.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/1be8fc772d09/ changeset: 1be8fc772d09 user: flub date: 2011-10-16 12:51:15 summary: Look up the pytest_assertrepr_compare hook for each test item Before this was only done at the time the assertion plugin was loaded. This lead to counter-intuitive behaviour where two subdirectories with a pytest_assertrepr_compare hook in their conftest.py would not work, only one would ever be used. This defers assiging the _pytest.assertion.util._reprcompare function until the item is loaded (pytest_runtest_setup) so that it can use the hookrelay of the test item to find the appropriate pytest_assertrepr_compare hook for the item. This fixes issue #77. affected #: 2 files (-1 bytes) --- a/_pytest/assertion/__init__.py Fri Oct 14 18:08:10 2011 -0400 +++ b/_pytest/assertion/__init__.py Sun Oct 16 11:51:15 2011 +0100 @@ -43,23 +43,10 @@ mode = "reinterp" if mode != "plain": _load_modules(mode) - def callbinrepr(op, left, right): - hook_result = config.hook.pytest_assertrepr_compare( - config=config, op=op, left=left, right=right) - for new_expl in hook_result: - if new_expl: - res = '\n~'.join(new_expl) - if mode == "rewrite": - # The result will be fed back a python % formatting - # operation, which will fail if there are extraneous - # '%'s in the string. Escape them here. - res = res.replace("%", "%%") - return res m = monkeypatch() config._cleanup.append(m.undo) m.setattr(py.builtin.builtins, 'AssertionError', reinterpret.AssertionError) - m.setattr(util, '_reprcompare', callbinrepr) hook = None if mode == "rewrite": hook = rewrite.AssertionRewritingHook() @@ -82,6 +69,24 @@ if hook is not None: hook.set_session(session) +def pytest_runtest_setup(item): + def callbinrepr(op, left, right): + hook_result = item.ihook.pytest_assertrepr_compare( + config=item.config, op=op, left=left, right=right) + for new_expl in hook_result: + if new_expl: + res = '\n~'.join(new_expl) + if item.config.getvalue("assertmode") == "rewrite": + # The result will be fed back a python % formatting + # operation, which will fail if there are extraneous + # '%'s in the string. Escape them here. + res = res.replace("%", "%%") + return res + util._reprcompare = callbinrepr + +def pytest_runtest_teardown(item): + util._reprcompare = None + def pytest_sessionfinish(session): hook = session.config._assertstate.hook if hook is not None: --- a/testing/test_assertion.py Fri Oct 14 18:08:10 2011 -0400 +++ b/testing/test_assertion.py Sun Oct 16 11:51:15 2011 +0100 @@ -40,15 +40,6 @@ assert hook.left == [0, 1] assert hook.right == [0, 2] - def test_configure_unconfigure(self, testdir, hook): - assert hook == util._reprcompare - config = testdir.parseconfig() - plugin.pytest_configure(config) - assert hook != util._reprcompare - from _pytest.config import pytest_unconfigure - pytest_unconfigure(config) - assert hook == util._reprcompare - def callequal(left, right): return plugin.pytest_assertrepr_compare('==', left, right) @@ -167,6 +158,28 @@ "*E*'y'*", ]) + at needsnewassert +def test_assertrepr_loaded_per_dir(testdir): + testdir.makepyfile(test_base=['def test_base(): assert 1 == 2']) + a = testdir.mkdir('a') + a_test = a.join('test_a.py') + a_test.write('def test_a(): assert 1 == 2') + a_conftest = a.join('conftest.py') + a_conftest.write('def pytest_assertrepr_compare(): return ["summary a"]') + b = testdir.mkdir('b') + b_test = b.join('test_b.py') + b_test.write('def test_b(): assert 1 == 2') + b_conftest = b.join('conftest.py') + b_conftest.write('def pytest_assertrepr_compare(): return ["summary b"]') + result = testdir.runpytest() + result.stdout.fnmatch_lines([ + '*def test_base():*', + '*E*assert 1 == 2*', + '*def test_a():*', + '*E*assert summary a*', + '*def test_b():*', + '*E*assert summary b*']) + def test_assertion_options(testdir): testdir.makepyfile(""" 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 Oct 17 23:18:18 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Mon, 17 Oct 2011 21:18:18 -0000 Subject: [py-svn] commit/pytest: flub: Mention issue #77 in changelog Message-ID: <20111017211818.31702.5383@bitbucket01.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/7c63ed12c0a4/ changeset: 7c63ed12c0a4 user: flub date: 2011-10-17 23:17:41 summary: Mention issue #77 in changelog affected #: 1 file (-1 bytes) --- a/CHANGELOG Sun Oct 16 11:51:15 2011 +0100 +++ b/CHANGELOG Mon Oct 17 22:17:41 2011 +0100 @@ -5,6 +5,7 @@ - correctly handle zero length arguments (a la pytest '') - fix issue67 / junitxml now contains correct test durations, thanks ronny - fix issue75 / skipping test failure on jython +- fix issue77 / Allow assertrepr_compare hook to apply to a subset of tests Changes between 2.1.1 and 2.1.2 ---------------------------------------- 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 Oct 18 20:07:54 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Tue, 18 Oct 2011 18:07:54 -0000 Subject: [py-svn] commit/pytest: hpk42: bump to version 2.1.3, add release announce, regen docs (with make regen) Message-ID: <20111018180754.6543.61323@bitbucket02.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/07ab05f535b9/ changeset: 07ab05f535b9 user: hpk42 date: 2011-10-18 20:07:45 summary: bump to version 2.1.3, add release announce, regen docs (with make regen) affected #: 23 files (-1 bytes) --- a/CHANGELOG Mon Oct 17 22:17:41 2011 +0100 +++ b/CHANGELOG Tue Oct 18 20:07:45 2011 +0200 @@ -1,7 +1,7 @@ -Changes between 2.1.2 and [next version] +Changes between 2.1.2 and 2.1.3 ---------------------------------------- -- fix issue79: rewriting failed on some comparisons in boolops +- fix issue79: assertion rewriting failed on some comparisons in boolops - correctly handle zero length arguments (a la pytest '') - fix issue67 / junitxml now contains correct test durations, thanks ronny - fix issue75 / skipping test failure on jython --- a/ISSUES.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/ISSUES.txt Tue Oct 18 20:07:45 2011 +0200 @@ -7,6 +7,13 @@ the protocol now - setup/teardown is called at module level. consider making calling of setup/teardown configurable +optimizations +--------------------------------------------------------------- +tags: 2.4 core + +- look at ihook optimization such that all lookups for + hooks relating to the same fspath are cached. + fix start/finish partial finailization problem --------------------------------------------------------------- tags: bug core --- a/_pytest/__init__.py Mon Oct 17 22:17:41 2011 +0100 +++ b/_pytest/__init__.py Tue Oct 18 20:07:45 2011 +0200 @@ -1,2 +1,2 @@ # -__version__ = '2.1.3dev1' +__version__ = '2.1.3' --- a/doc/assert.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/assert.txt Tue Oct 18 20:07:45 2011 +0200 @@ -23,7 +23,7 @@ $ py.test test_assert1.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_assert1.py F @@ -37,7 +37,7 @@ E + where 3 = f() test_assert1.py:5: AssertionError - ========================= 1 failed in 0.01 seconds ========================= + ========================= 1 failed in 0.03 seconds ========================= py.test has support for showing the values of the most common subexpressions including calls, attributes, comparisons, and binary and unary @@ -105,7 +105,7 @@ $ py.test test_assert2.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_assert2.py F @@ -124,7 +124,7 @@ E '5' test_assert2.py:5: AssertionError - ========================= 1 failed in 0.01 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= Special comparisons are done for a number of cases: @@ -181,7 +181,7 @@ E vals: 1 != 2 test_foocompare.py:8: AssertionError - 1 failed in 0.01 seconds + 1 failed in 0.02 seconds .. _assert-details: .. _`assert introspection`: --- a/doc/builtin.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/builtin.txt Tue Oct 18 20:07:45 2011 +0200 @@ -25,7 +25,7 @@ $ py.test --funcargs =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collected 0 items pytestconfig the pytest config object with access to command line opts. @@ -72,5 +72,7 @@ See http://docs.python.org/library/warnings.html for information on warning categories. + cov + A pytest funcarg that provides access to the underlying coverage object. ============================= in 0.00 seconds ============================= --- a/doc/capture.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/capture.txt Tue Oct 18 20:07:45 2011 +0200 @@ -64,7 +64,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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.01 seconds ==================== + setting up + ==================== 1 failed, 1 passed in 0.03 seconds ==================== Accessing captured output from a test function --------------------------------------------------- --- a/doc/doctest.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/doctest.txt Tue Oct 18 20:07:45 2011 +0200 @@ -44,9 +44,10 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items mymodule.py . - ========================= 1 passed in 0.02 seconds ========================= + ========================= 1 passed in 0.06 seconds ========================= + [?1034h \ No newline at end of file --- a/doc/example/mysetup.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/example/mysetup.txt Tue Oct 18 20:07:45 2011 +0200 @@ -49,7 +49,7 @@ $ py.test test_sample.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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.01 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= This means that our ``mysetup`` object was successfully instantiated and ``mysetup.app()`` returned an initialized ``MyApp`` instance. @@ -122,14 +122,14 @@ $ py.test test_ssh.py -rs =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_ssh.py s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-296/conftest.py:22: specify ssh host with --ssh + SKIP [1] /Users/hpk/tmp/doc-exec-167/conftest.py:22: specify ssh host with --ssh - ======================== 1 skipped in 0.01 seconds ========================= + ======================== 1 skipped in 0.02 seconds ========================= If you specify a command line option like ``py.test --ssh=python.org`` the test will execute as expected. --- a/doc/example/nonpython.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/example/nonpython.txt Tue Oct 18 20:07:45 2011 +0200 @@ -27,7 +27,7 @@ nonpython $ py.test test_simple.yml =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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.07 seconds ==================== + ==================== 1 failed, 1 passed in 0.09 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.7.1 -- pytest-2.1.1 -- /home/hpk/venv/0/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.1.3 -- /Users/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.06 seconds ==================== + ==================== 1 failed, 1 passed in 0.09 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.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items - ============================= in 0.06 seconds ============================= + ============================= in 0.08 seconds ============================= --- a/doc/example/parametrize.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/example/parametrize.txt Tue Oct 18 20:07:45 2011 +0200 @@ -44,7 +44,7 @@ $ py.test -q test_compute.py collecting ... collected 2 items .. - 2 passed in 0.01 seconds + 2 passed in 0.02 seconds We run only two computations, so we see two dots. let's run the full monty:: @@ -62,7 +62,7 @@ E assert 4 < 4 test_compute.py:3: AssertionError - 1 failed, 4 passed in 0.01 seconds + 1 failed, 4 passed in 0.03 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.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items - ============================= in 0.00 seconds ============================= + ============================= in 0.01 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.01 seconds + 1 failed, 1 passed in 0.02 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.02 seconds + 3 failed, 3 passed in 0.05 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.02 seconds + 2 failed, 2 passed in 0.04 seconds Checking serialization between Python interpreters -------------------------------------------------------------- @@ -290,5 +290,5 @@ . $ 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.48 seconds + ssssss...ss...ss...ssssssssssss...ss...ss...ssssssssssss...ss...ss...ssssss + 27 passed, 48 skipped in 3.04 seconds --- a/doc/example/pythoncollection.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/example/pythoncollection.txt Tue Oct 18 20:07:45 2011 +0200 @@ -43,7 +43,7 @@ $ py.test --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items @@ -51,7 +51,7 @@ - ============================= in 0.01 seconds ============================= + ============================= in 0.02 seconds ============================= Interpreting cmdline arguments as Python packages ----------------------------------------------------- @@ -82,7 +82,7 @@ . $ py.test --collectonly pythoncollection.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 3 items --- a/doc/example/reportingdemo.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/example/reportingdemo.txt Tue Oct 18 20:07:45 2011 +0200 @@ -13,7 +13,7 @@ assertion $ py.test failure_demo.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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( @@ -66,19 +66,19 @@ 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:833>:1: ValueError + <0-codegen /Users/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: @@ -420,10 +420,10 @@ > assert 1 == 0 E assert 1 == 0 - <2-codegen 'abc-123' /home/hpk/p/pytest/doc/example/assertion/failure_demo.py:162>:2: AssertionError + <2-codegen 'abc-123' /Users/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,19 +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 ('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(): @@ -492,15 +492,15 @@ def g(): return "456" > assert f().startswith(g()) - E assert ('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) @@ -510,18 +510,18 @@ 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 = .x + E + where 42 = .x failure_demo.py:202: AssertionError _______________________ TestMoreErrors.test_compare ________________________ - self = + self = def test_compare(self): > assert globf(10) < 5 @@ -531,7 +531,7 @@ failure_demo.py:205: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ - self = + self = def test_try_finally(self): x = 1 @@ -540,4 +540,4 @@ E assert 1 == 0 failure_demo.py:210: AssertionError - ======================== 39 failed in 0.20 seconds ========================= + ======================== 39 failed in 0.39 seconds ========================= --- a/doc/example/simple.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/example/simple.txt Tue Oct 18 20:07:45 2011 +0200 @@ -53,7 +53,7 @@ test_sample.py:6: AssertionError ----------------------------- Captured stdout ------------------------------ first - 1 failed in 0.01 seconds + 1 failed in 0.02 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.01 seconds + 1 failed in 0.02 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.7.1 -- pytest-2.1.1 - gw0 I / gw1 I - gw0 [0] / gw1 [0] + platform darwin -- Python 2.7.1 -- pytest-2.1.3 + gw0 I + gw0 [0] scheduling tests via LoadScheduling - ============================= in 0.26 seconds ============================= + ============================= in 0.48 seconds ============================= .. _`excontrolskip`: @@ -156,25 +156,25 @@ $ py.test -rs # "-rs" means report details on the little 's' =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-301/conftest.py:9: need --runslow option to run + SKIP [1] /Users/hpk/tmp/doc-exec-172/conftest.py:9: need --runslow option to run - =================== 1 passed, 1 skipped in 0.01 seconds ==================== + =================== 1 passed, 1 skipped in 0.02 seconds ==================== Or run it including the ``slow`` marked test:: $ py.test --runslow =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items test_module.py .. - ========================= 2 passed in 0.01 seconds ========================= + ========================= 2 passed in 0.02 seconds ========================= Writing well integrated assertion helpers -------------------------------------------------- @@ -213,7 +213,7 @@ E Failed: not configured: 42 test_checkconfig.py:8: Failed - 1 failed in 0.01 seconds + 1 failed in 0.02 seconds Detect if running from within a py.test run -------------------------------------------------------------- @@ -261,7 +261,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 project deps: mylib-1.1 collecting ... collected 0 items @@ -284,7 +284,7 @@ $ py.test -v =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 -- /home/hpk/venv/0/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.1.3 -- /Users/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.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 0 items ============================= in 0.00 seconds ============================= --- a/doc/funcargs.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/funcargs.txt Tue Oct 18 20:07:45 2011 +0200 @@ -61,7 +61,7 @@ $ py.test test_simplefactory.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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.01 seconds ========================= + ========================= 1 failed in 0.02 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.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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.02 seconds ==================== + ==================== 1 failed, 9 passed in 0.04 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.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 10 items @@ -204,19 +204,37 @@ - ============================= in 0.00 seconds ============================= + ============================= in 0.01 seconds ============================= If you want to select only the run with the value ``7`` you could do:: $ py.test -v -k 7 test_example.py # or -k test_func[7] =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 -- /home/hpk/venv/0/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.1.3 -- /Users/hpk/venv/0/bin/python collecting ... collected 10 items + test_example.py:6: test_func[0] PASSED + test_example.py:6: test_func[1] PASSED + test_example.py:6: test_func[2] PASSED + test_example.py:6: test_func[3] PASSED + test_example.py:6: test_func[4] PASSED + test_example.py:6: test_func[5] PASSED + test_example.py:6: test_func[6] PASSED test_example.py:6: test_func[7] PASSED + test_example.py:6: test_func[8] PASSED + test_example.py:6: test_func[9] FAILED - ======================== 9 tests deselected by '7' ========================= - ================== 1 passed, 9 deselected in 0.01 seconds ================== + ================================= FAILURES ================================= + _______________________________ test_func[9] _______________________________ + + numiter = 9 + + def test_func(numiter): + > assert numiter < 9 + E assert 9 < 9 + + test_example.py:7: AssertionError + ==================== 1 failed, 9 passed in 0.05 seconds ==================== You might want to look at :ref:`more parametrization examples `. --- a/doc/getting-started.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/getting-started.txt Tue Oct 18 20:07:45 2011 +0200 @@ -22,9 +22,10 @@ To check your installation has installed the correct version:: $ py.test --version - This is py.test version 2.1.1, imported from /home/hpk/p/pytest/pytest.py + This is py.test version 2.1.3, imported from /Users/hpk/p/pytest/pytest.pyc setuptools registered plugins: - pytest-xdist-1.6 at /home/hpk/p/pytest-xdist/xdist/plugin.pyc + pytest-cov-1.4 at /Users/hpk/venv/0/lib/python2.7/site-packages/pytest_cov.pyc + pytest-xdist-1.6 at /Users/hpk/venv/0/lib/python2.7/site-packages/xdist/plugin.pyc If you get an error checkout :ref:`installation issues`. @@ -46,7 +47,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_sample.py F @@ -60,7 +61,7 @@ E + where 4 = func(3) test_sample.py:5: AssertionError - ========================= 1 failed in 0.01 seconds ========================= + ========================= 1 failed in 0.02 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``. @@ -95,7 +96,7 @@ $ py.test -q test_sysexit.py collecting ... collected 1 items . - 1 passed in 0.00 seconds + 1 passed in 0.01 seconds .. todo:: For further ways to assert exceptions see the `raises` @@ -126,7 +127,7 @@ ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - self = + self = def test_two(self): x = "hello" @@ -134,7 +135,7 @@ E assert hasattr('hello', 'check') test_class.py:8: AssertionError - 1 failed, 1 passed in 0.01 seconds + 1 failed, 1 passed in 0.03 seconds The first test passed, the second failed. Again we can easily see the intermediate values used in the assertion, helping us to @@ -163,7 +164,7 @@ ================================= FAILURES ================================= _____________________________ test_needsfiles ______________________________ - tmpdir = local('/tmp/pytest-60/test_needsfiles0') + tmpdir = local('/Users/hpk/tmp/pytest-93/test_needsfiles0') def test_needsfiles(tmpdir): print tmpdir @@ -172,8 +173,8 @@ test_tmpdir.py:3: AssertionError ----------------------------- Captured stdout ------------------------------ - /tmp/pytest-60/test_needsfiles0 - 1 failed in 0.02 seconds + /Users/hpk/tmp/pytest-93/test_needsfiles0 + 1 failed in 0.04 seconds Before the test runs, a unique-per-test-invocation temporary directory was created. More info at :ref:`tmpdir handling`. --- a/doc/mark.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/mark.txt Tue Oct 18 20:07:45 2011 +0200 @@ -88,35 +88,35 @@ $ py.test -k webtest # running with the above defined examples yields =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 4 items test_mark.py .. test_mark_classlevel.py .. - ========================= 4 passed in 0.01 seconds ========================= + ========================= 4 passed in 0.03 seconds ========================= And you can also run all tests except the ones that match the keyword:: $ py.test -k-webtest =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 4 items ===================== 4 tests deselected by '-webtest' ===================== - ======================= 4 deselected in 0.01 seconds ======================= + ======================= 4 deselected in 0.02 seconds ======================= Or to only select the class:: $ py.test -kTestClass =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 4 items test_mark_classlevel.py .. ==================== 2 tests deselected by 'TestClass' ===================== - ================== 2 passed, 2 deselected in 0.01 seconds ================== + ================== 2 passed, 2 deselected in 0.02 seconds ================== API reference for mark related objects ------------------------------------------------ --- a/doc/monkeypatch.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/monkeypatch.txt Tue Oct 18 20:07:45 2011 +0200 @@ -39,7 +39,7 @@ .. background check: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 0 items ============================= in 0.00 seconds ============================= --- a/doc/projects.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/projects.txt Tue Oct 18 20:07:45 2011 +0200 @@ -46,7 +46,7 @@ * `Some Mozilla QA people `_ use pytest to distribute their Selenium tests * `Tandberg `_ * `Shootq `_ -* `Stups department of Heinrich Heine University D?sseldorf `_ +* `Stups department of Heinrich Heine University Duesseldorf `_ * `cellzome `_ * `Open End, Gothenborg `_ * `Laboraratory of Bioinformatics, Warsaw `_ --- a/doc/skipping.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/skipping.txt Tue Oct 18 20:07:45 2011 +0200 @@ -130,7 +130,7 @@ example $ py.test -rx xfail_demo.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 6 items xfail_demo.py xxxxxx @@ -147,7 +147,7 @@ XFAIL xfail_demo.py::test_hello6 reason: reason - ======================== 6 xfailed in 0.03 seconds ========================= + ======================== 6 xfailed in 0.11 seconds ========================= .. _`evaluation of skipif/xfail conditions`: --- a/doc/tmpdir.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/tmpdir.txt Tue Oct 18 20:07:45 2011 +0200 @@ -28,7 +28,7 @@ $ py.test test_tmpdir.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_tmpdir.py F @@ -36,7 +36,7 @@ ================================= FAILURES ================================= _____________________________ test_create_file _____________________________ - tmpdir = local('/tmp/pytest-61/test_create_file0') + tmpdir = local('/Users/hpk/tmp/pytest-94/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.03 seconds ========================= + ========================= 1 failed in 0.05 seconds ========================= .. _`base temporary directory`: --- a/doc/unittest.txt Mon Oct 17 22:17:41 2011 +0100 +++ b/doc/unittest.txt Tue Oct 18 20:07:45 2011 +0200 @@ -24,7 +24,7 @@ $ py.test test_unittest.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_unittest.py F @@ -42,7 +42,7 @@ test_unittest.py:8: AssertionError ----------------------------- Captured stdout ------------------------------ hello - ========================= 1 failed in 0.02 seconds ========================= + ========================= 1 failed in 0.04 seconds ========================= .. _`unittest.py style`: http://docs.python.org/library/unittest.html --- a/setup.py Mon Oct 17 22:17:41 2011 +0100 +++ b/setup.py Tue Oct 18 20:07:45 2011 +0200 @@ -24,7 +24,7 @@ name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.1.3dev1', + version='2.1.3', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], 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 Oct 18 21:01:45 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Tue, 18 Oct 2011 19:01:45 -0000 Subject: [py-svn] commit/pytest: 2 new changesets Message-ID: <20111018190145.7948.98589@bitbucket05.managed.contegix.com> 2 new changesets in pytest: http://bitbucket.org/hpk42/pytest/changeset/12a05d59249f/ changeset: 12a05d59249f user: hpk42 date: 2011-10-18 20:58:19 summary: add 2.1.3 release announce to index, add floris to thanks affected #: 2 files (-1 bytes) --- a/doc/announce/index.txt Tue Oct 18 20:07:45 2011 +0200 +++ b/doc/announce/index.txt Tue Oct 18 20:58:19 2011 +0200 @@ -5,6 +5,7 @@ .. toctree:: :maxdepth: 2 + release-2.1.3 release-2.1.2 release-2.1.1 release-2.1.0 --- a/doc/announce/release-2.1.3.txt Tue Oct 18 20:07:45 2011 +0200 +++ b/doc/announce/release-2.1.3.txt Tue Oct 18 20:58:19 2011 +0200 @@ -17,7 +17,7 @@ easy_install -U pytest Thanks to the bug reporters and to Ronny Pfannschmidt, Benjamin Peterson -and who implemented the fixes. +and Floris Bruynooghe who implemented the fixes. best, holger krekel http://bitbucket.org/hpk42/pytest/changeset/de8717c70dd3/ changeset: de8717c70dd3 user: hpk42 date: 2011-10-18 21:01:37 summary: Added tag 2.1.3 for changeset 12a05d59249f affected #: 1 file (-1 bytes) --- a/.hgtags Tue Oct 18 20:58:19 2011 +0200 +++ b/.hgtags Tue Oct 18 21:01:37 2011 +0200 @@ -43,3 +43,4 @@ 363e5a5a59c803e6bc176a6f9cc4bf1a1ca2dab0 2.0.3 e5e1746a197f0398356a43fbe2eebac9690f795d 2.1.0 5864412c6f3c903384243bd315639d101d7ebc67 2.1.2 +12a05d59249f80276e25fd8b96e8e545b1332b7a 2.1.3 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 Oct 21 15:46:03 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Fri, 21 Oct 2011 13:46:03 -0000 Subject: [py-svn] commit/pytest: hpk42: fix issue83 - add a link to already generated list of funcargs Message-ID: <20111021134603.11673.36346@bitbucket12.managed.contegix.com> 1 new changeset in pytest: http://bitbucket.org/hpk42/pytest/changeset/96e27d73c00c/ changeset: 96e27d73c00c user: hpk42 date: 2011-10-21 15:45:56 summary: fix issue83 - add a link to already generated list of funcargs affected #: 3 files (-1 bytes) --- a/CHANGELOG Tue Oct 18 21:01:37 2011 +0200 +++ b/CHANGELOG Fri Oct 21 15:45:56 2011 +0200 @@ -1,3 +1,8 @@ +Changes between 2.1.3 and [next version] +---------------------------------------- + +- fix issue83: link to generated funcarg list + Changes between 2.1.2 and 2.1.3 ---------------------------------------- --- a/doc/builtin.txt Tue Oct 18 21:01:37 2011 +0200 +++ b/doc/builtin.txt Fri Oct 21 15:45:56 2011 +0200 @@ -17,6 +17,9 @@ .. automodule:: pytest :members: + +.. _builtinfuncargs: + Builtin function arguments ----------------------------------------------------- --- a/doc/funcargs.txt Tue Oct 18 21:01:37 2011 +0200 +++ b/doc/funcargs.txt Fri Oct 21 15:45:56 2011 +0200 @@ -38,6 +38,7 @@ or with multiple numerical arguments sets and want to reuse the same set of test functions. +py.test comes with :ref:`builtinfuncargs` and there are some refined usages in the examples section. .. _funcarg: 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 Wed Oct 26 22:45:02 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Wed, 26 Oct 2011 20:45:02 -0000 Subject: [py-svn] commit/pytest: RonnyPfannschmidt: fix issue74 - propperly filter out missfit names in _tryconvertpyarg Message-ID: <20111026204502.2655.85069@bitbucket03.managed.contegix.com> 1 new commit in pytest: https://bitbucket.org/hpk42/pytest/changeset/219e8a76419c/ changeset: 219e8a76419c user: RonnyPfannschmidt date: 2011-10-26 22:40:08 summary: fix issue74 - propperly filter out missfit names in _tryconvertpyarg affected #: 3 files diff -r 96e27d73c00cdc3af95572463ac93a1da46bcca5 -r 219e8a76419c812c17ce65c8f665a494b878aca3 CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ ---------------------------------------- - fix issue83: link to generated funcarg list +- fix issue74: pyarg module names are now checked against imp.find_module false positives Changes between 2.1.2 and 2.1.3 ---------------------------------------- diff -r 96e27d73c00cdc3af95572463ac93a1da46bcca5 -r 219e8a76419c812c17ce65c8f665a494b878aca3 _pytest/main.py --- a/_pytest/main.py +++ b/_pytest/main.py @@ -11,6 +11,8 @@ EXIT_INTERRUPTED = 2 EXIT_INTERNALERROR = 3 +name_re = py.std.re.compile("^[a-zA-Z_]\w*$") + def pytest_addoption(parser): parser.addini("norecursedirs", "directory patterns to avoid for recursion", type="args", default=('.*', 'CVS', '_darcs', '{arch}')) @@ -472,6 +474,13 @@ mod = None path = [os.path.abspath('.')] + sys.path for name in x.split('.'): + # ignore anything thats not a propper name here + # else something like --pyargs will mess up '.' + # since imp.find_module will actually sometimes works for it + # but its supposed to be considered a filesystem path + # not a package + if name_re.match(name) is None: + return x try: fd, mod, type_ = imp.find_module(name, path) except ImportError: diff -r 96e27d73c00cdc3af95572463ac93a1da46bcca5 -r 219e8a76419c812c17ce65c8f665a494b878aca3 testing/acceptance_test.py --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -408,6 +408,14 @@ result.stdout.fnmatch_lines([ "*2 passed*" ]) + + result = testdir.runpytest("--pyargs", ".") + assert result.ret == 0 + result.stdout.fnmatch_lines([ + "*2 passed*" + ]) + + monkeypatch.setenv('PYTHONPATH', testdir) path.join('test_hello.py').remove() result = testdir.runpytest("--pyargs", "tpkg.test_hello") assert result.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 Wed Oct 26 23:59:55 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Wed, 26 Oct 2011 21:59:55 -0000 Subject: [py-svn] commit/pytest: RonnyPfannschmidt: proper tests for issue74, thanks Arfrever Message-ID: <20111026215955.16950.40077@bitbucket02.managed.contegix.com> 1 new commit in pytest: https://bitbucket.org/hpk42/pytest/changeset/61c9b06454c7/ changeset: 61c9b06454c7 user: RonnyPfannschmidt date: 2011-10-26 23:59:22 summary: proper tests for issue74, thanks Arfrever affected #: 1 file diff -r 219e8a76419c812c17ce65c8f665a494b878aca3 -r 61c9b06454c7d040971fe047b60c234fdee80574 testing/acceptance_test.py --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -403,12 +403,9 @@ result.stdout.fnmatch_lines([ "*1 passed*" ]) - result = testdir.runpytest("--pyargs", ".") - assert result.ret == 0 - result.stdout.fnmatch_lines([ - "*2 passed*" - ]) + empty_package = testdir.mkpydir("empty_package") + monkeypatch.setenv('PYTHONPATH', empty_package) result = testdir.runpytest("--pyargs", ".") assert result.ret == 0 result.stdout.fnmatch_lines([ 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 Oct 27 07:39:13 2011 From: commits-noreply at bitbucket.org (Bitbucket) Date: Thu, 27 Oct 2011 05:39:13 -0000 Subject: [py-svn] commit/pytest: RonnyPfannschmidt: fix some of my typos, thanks Arfrever Message-ID: <20111027053913.15273.10421@bitbucket05.managed.contegix.com> 1 new commit in pytest: https://bitbucket.org/hpk42/pytest/changeset/bc2f63120b35/ changeset: bc2f63120b35 user: RonnyPfannschmidt date: 2011-10-27 07:38:44 summary: fix some of my typos, thanks Arfrever affected #: 1 file diff -r 61c9b06454c7d040971fe047b60c234fdee80574 -r bc2f63120b354025a3de44a73ad1d8bd003a04c3 _pytest/main.py --- a/_pytest/main.py +++ b/_pytest/main.py @@ -474,10 +474,10 @@ mod = None path = [os.path.abspath('.')] + sys.path for name in x.split('.'): - # ignore anything thats not a propper name here + # ignore anything that's not a proper name here # else something like --pyargs will mess up '.' - # since imp.find_module will actually sometimes works for it - # but its supposed to be considered a filesystem path + # since imp.find_module will actually sometimes work for it + # but it's supposed to be considered a filesystem path # not a package if name_re.match(name) is None: return x 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.