2 new commits in pytest:

https://bitbucket.org/pytest-dev/pytest/commits/08f6d8931149/
Changeset:   08f6d8931149
Branch:      parametrized-fixture-override
User:        bubenkoff
Date:        2015-03-02 19:18:06+00:00
Summary:     fix typo
Affected #:  1 file

diff -r 03d41bd86f9fc0de41b349866d3f947c52ae6bd5 -r 
08f6d8931149c4fc43974c6fa32c44bc493ff506 testing/python/collect.py
--- a/testing/python/collect.py
+++ b/testing/python/collect.py
@@ -393,9 +393,9 @@
                 return 'value'
 
             @pytest.mark.parametrize('value',
-                                     ['overrided'])
-            def test_overrided_via_param(value):
-                assert value == 'overrided'
+                                     ['overridden'])
+            def test_overridden_via_param(value):
+                assert value == 'overridden'
         """)
         rec = testdir.inline_run()
         rec.assertoutcome(passed=1)
@@ -411,9 +411,9 @@
                 return request.param
 
             @pytest.mark.parametrize('value',
-                                     ['overrided'])
-            def test_overrided_via_param(value):
-                assert value == 'overrided'
+                                     ['overridden'])
+            def test_overridden_via_param(value):
+                assert value == 'overridden'
         """)
         rec = testdir.inline_run()
         rec.assertoutcome(passed=1)


https://bitbucket.org/pytest-dev/pytest/commits/57a91987983a/
Changeset:   57a91987983a
Branch:      parametrized-fixture-override
User:        bubenkoff
Date:        2015-03-02 19:18:31+00:00
Summary:     merge with upstream
Affected #:  3 files

diff -r 08f6d8931149c4fc43974c6fa32c44bc493ff506 -r 
57a91987983a794c05cfb887c6b335194c6b4918 Makefile
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 
 # install all needed for development
 develop: .env
-       .env/bin/pip install -e .[test] tox
+       .env/bin/pip install -e . tox
 
 # clean the development envrironment
 clean:

diff -r 08f6d8931149c4fc43974c6fa32c44bc493ff506 -r 
57a91987983a794c05cfb887c6b335194c6b4918 _pytest/python.py
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1712,9 +1712,8 @@
     def pytest_generate_tests(self, metafunc):
         for argname in metafunc.fixturenames:
             faclist = metafunc._arg2fixturedefs.get(argname)
-            if faclist is None:
-                continue # will raise FixtureLookupError at setup time
-            for fixturedef in faclist[-1:]:
+            if faclist:
+                fixturedef = faclist[-1]
                 if fixturedef.params is not None:
                     func_params = getattr(getattr(metafunc.function, 
'parametrize', None), 'args', [[None]])
                     # skip directly parametrized arguments
@@ -1722,6 +1721,8 @@
                         metafunc.parametrize(argname, fixturedef.params,
                                              indirect=True, 
scope=fixturedef.scope,
                                              ids=fixturedef.ids)
+            else:
+                continue # will raise FixtureLookupError at setup time
 
     def pytest_collection_modifyitems(self, items):
         # separate parametrized setups

diff -r 08f6d8931149c4fc43974c6fa32c44bc493ff506 -r 
57a91987983a794c05cfb887c6b335194c6b4918 tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -136,7 +136,7 @@
 minversion=2.0
 plugins=pytester
 #--pyargs --doctest-modules --ignore=.tox
-addopts= -rxsX
+addopts= -rxsX -vl
 rsyncdirs=tox.ini pytest.py _pytest testing
 python_files=test_*.py *_test.py testing/*/*.py
 python_classes=Test Acceptance

Repository URL: https://bitbucket.org/pytest-dev/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.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit

Reply via email to