[Pytest-commit] commit/pytest: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in pytest:

https://bitbucket.org/pytest-dev/pytest/commits/d98609a4ab9b/
Changeset:   d98609a4ab9b
Branch:      issue616
User:        Eric Siegerman
Date:        2015-03-01 22:32:00+00:00
Summary:     Add comments
Affected #:  1 file

diff -r 525082e4ed8e3e214e22e0a9c7c2ae359a2d4cd5 -r d98609a4ab9be453850fc1925db68bc8b4b2fc25 testing/test_conftest.py
--- a/testing/test_conftest.py
+++ b/testing/test_conftest.py
@@ -312,21 +312,25 @@
     # N.B.: "swc" stands for "subdir with conftest.py"
     #       "snc" stands for "subdir no [i.e. without] conftest.py"
     @pytest.mark.parametrize("chdir,testarg,expect_ntests_passed", [
+	# Effective target: package/..
         ("runner",  "..",               3),
         ("package", "..",               3),
         ("swc",     "../..",            3),
         ("snc",     "../..",            3),
 
+	# Effective target: package
         ("runner",  "../package",       3),
         ("package", ".",                3),
         ("swc",     "..",               3),
         ("snc",     "..",               3),
 
+	# Effective target: package/swc
         ("runner",  "../package/swc",   1),
         ("package", "./swc",            1),
         ("swc",     ".",                1),
         ("snc",     "../swc",           1),
 
+	# Effective target: package/snc
         ("runner",  "../package/snc",   1),
         ("package", "./snc",            1),
         ("swc",     "../snc",           1),


https://bitbucket.org/pytest-dev/pytest/commits/e26175bf8246/
Changeset:   e26175bf8246
User:        RonnyPfannschmidt
Date:        2015-03-02 13:38:10+00:00
Summary:     Merged in eks/pytest/issue616 (pull request #258)

Add comments
Affected #:  1 file

diff -r 163964f4f0f48204f9f42d080778f23d6673f0b0 -r e26175bf8246f01fc5573e92359b3124624c31b7 testing/test_conftest.py
--- a/testing/test_conftest.py
+++ b/testing/test_conftest.py
@@ -312,21 +312,25 @@
     # N.B.: "swc" stands for "subdir with conftest.py"
     #       "snc" stands for "subdir no [i.e. without] conftest.py"
     @pytest.mark.parametrize("chdir,testarg,expect_ntests_passed", [
+	# Effective target: package/..
         ("runner",  "..",               3),
         ("package", "..",               3),
         ("swc",     "../..",            3),
         ("snc",     "../..",            3),
 
+	# Effective target: package
         ("runner",  "../package",       3),
         ("package", ".",                3),
         ("swc",     "..",               3),
         ("snc",     "..",               3),
 
+	# Effective target: package/swc
         ("runner",  "../package/swc",   1),
         ("package", "./swc",            1),
         ("swc",     ".",                1),
         ("snc",     "../swc",           1),
 
+	# Effective target: package/snc
         ("runner",  "../package/snc",   1),
         ("package", "./snc",            1),
         ("swc",     "../snc",           1),

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.