[Pytest-commit] commit/pytest: hpk42: fix issue587: claim only python2.6 compat in README/pypi project page, thanks sscarwell

2014-09-09 Thread commits-noreply 
1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/013e13382011/
Changeset:   013e13382011
User:hpk42
Date:2014-09-09 11:22:39
Summary: fix issue587: claim only python2.6 compat in README/pypi project 
page, thanks sscarwell
Affected #:  1 file

diff -r bbc15902ae03b5efe0b0afdfb37cd1796426ba0a -r 
013e1338201118fb7399f6a3c29d8f754502ba92 README.rst
--- a/README.rst
+++ b/README.rst
@@ -19,8 +19,9 @@
 - multi-paradigm support: you can use ``pytest`` to run test suites based
   on `unittest `_ (or trial),
   `nose `_
-- single-source compatibility to Python2.5 all the way up to Python3.4,
-  PyPy-2.3 and Jython-2.5.1.
+- single-source compatibility from Python2.6 all the way up to
+  Python3.4, PyPy-2.3, (jython-2.5 untested)
+
 
 - many `external plugins 
`_.

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.
___
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit

[Pytest-commit] commit/pytest-xdist: 3 new changesets

2014-09-09 Thread commits-noreply 
3 new commits in pytest-xdist:

https://bitbucket.org/hpk42/pytest-xdist/commits/09aa37340244/
Changeset:   09aa37340244
Branch:  log-collection-diff
User:nicoddemus
Date:2014-08-03 01:59:45
Summary: Log different tests collected by slaves instead of an error

This is a proposal to fix #556.
Affected #:  2 files

diff -r 4c6c3926603135015691bcf537ed8dfe15b59874 -r 
09aa37340244997f7f32621ece15094f582da482 testing/test_dsession.py
--- a/testing/test_dsession.py
+++ b/testing/test_dsession.py
@@ -146,6 +146,25 @@
 crashitem = sched.remove_node(node)
 assert crashitem == collection[0]
 
+def test_schedule_different_tests_collected(self):
+"""
+Test that LoadScheduling is logging different tests were
+collected by slaves when that happens.
+"""
+node1 = MockNode()
+node2 = MockNode()
+sched = LoadScheduling(2)
+logged_messages = []
+py.log.setconsumer('loadsched', logged_messages.append)
+sched.addnode(node1)
+sched.addnode(node2)
+sched.addnode_collection(node1, ["a.py::test_1"])
+sched.addnode_collection(node2, ["a.py::test_2"])
+sched.init_distribute()
+logged_content = ''.join(x.content() for x in logged_messages)
+assert 'Different tests were collected between' in logged_content
+assert 'Different tests collected, aborting run' in logged_content
+
 
 class TestDistReporter:
 
@@ -181,7 +200,7 @@
 def test_report_collection_diff_equal():
 """Test reporting of equal collections."""
 from_collection = to_collection = ['aaa', 'bbb', 'ccc']
-assert report_collection_diff(from_collection, to_collection, 1, 2)
+assert report_collection_diff(from_collection, to_collection, 1, 2) is None
 
 
 def test_report_collection_diff_different():
@@ -204,10 +223,8 @@
 '-YYY'
 )
 
-try:
-report_collection_diff(from_collection, to_collection, 1, 2)
-except AssertionError as e:
-assert py.builtin._totext(e) == error_message
+msg = report_collection_diff(from_collection, to_collection, 1, 2)
+assert msg == error_message
 
 @pytest.mark.xfail(reason="duplicate test ids not supported yet")
 def test_pytest_issue419(testdir):

diff -r 4c6c3926603135015691bcf537ed8dfe15b59874 -r 
09aa37340244997f7f32621ece15094f582da482 xdist/dsession.py
--- a/xdist/dsession.py
+++ b/xdist/dsession.py
@@ -17,7 +17,7 @@
 if log is None:
 self.log = py.log.Producer("eachsched")
 else:
-self.log = log.loadsched
+self.log = log.eachsched
 self.collection_is_completed = False
 
 def hasnodes(self):
@@ -139,22 +139,17 @@
 def init_distribute(self):
 assert self.collection_is_completed
 # XXX allow nodes to have different collections
-node_collection_items = list(self.node2collection.items())
-first_node, col = node_collection_items[0]
-for node, collection in node_collection_items[1:]:
-report_collection_diff(
-col,
-collection,
-first_node.gateway.id,
-node.gateway.id,
-)
+if not self._check_nodes_have_same_collection():
+self.log('**Different tests collected, aborting run**')
+return
 
 # all collections are the same, good.
 # we now create an index
-self.collection = col
-self.pending[:] = range(len(col))
-if not col:
+self.collection = list(self.node2collection.values())[0]
+self.pending[:] = range(len(self.collection))
+if not self.collection:
 return
+
 # how many items per node do we have about?
 items_per_node = len(self.collection) // len(self.node2pending)
 # take a fraction of tests for initial distribution
@@ -172,17 +167,36 @@
 self.node2pending[node].extend(tests_per_node)
 node.send_runtest_some(tests_per_node)
 
+def _check_nodes_have_same_collection(self):
+"""
+Return True if all nodes have collected the same items, False 
otherwise.
+This method also logs the collection differences as they are found.
+"""
+node_collection_items = list(self.node2collection.items())
+first_node, col = node_collection_items[0]
+same_collection = True
+for node, collection in node_collection_items[1:]:
+msg = report_collection_diff(
+col,
+collection,
+first_node.gateway.id,
+node.gateway.id,
+)
+if msg:
+self.log(msg)
+same_collection = False
+
+return same_collection
+
+
 def report_collection_diff(from_collection, to_collection, from_id, to_id):
 """Report the collected test difference between two nodes.
 
-:returns: True if collections are equal.
-
-:raise

[Pytest-commit] commit/pytest-xdist: bubenkoff: Merged in nicoddemus/pytest-xdist/log-collection-diff (pull request #9)

2014-09-09 Thread commits-noreply 
1 new commit in pytest-xdist:

https://bitbucket.org/hpk42/pytest-xdist/commits/84adc54b0ce9/
Changeset:   84adc54b0ce9
User:bubenkoff
Date:2014-09-10 02:10:32
Summary: Merged in nicoddemus/pytest-xdist/log-collection-diff (pull 
request #9)

Log different tests collected by slaves instead of an error
Affected #:  3 files

diff -r 4c6c3926603135015691bcf537ed8dfe15b59874 -r 
84adc54b0ce93d037ce3cac06a623bce3f599107 testing/acceptance_test.py
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -310,9 +310,9 @@
 """)
 result = testdir.runpytest("-n1", "-v")
 result.stdout.fnmatch_lines_random([
-"*PASS*test_pass_skip_fail.py?2*test_ok*",
-"*SKIP*test_pass_skip_fail.py?4*test_skip*",
-"*FAIL*test_pass_skip_fail.py?6*test_func*",
+"*PASS*test_pass_skip_fail.py*test_ok*",
+"*SKIP*test_pass_skip_fail.py*test_skip*",
+"*FAIL*test_pass_skip_fail.py*test_func*",
 ])
 result.stdout.fnmatch_lines([
 "*def test_func():",
@@ -327,7 +327,7 @@
 """)
 result = testdir.runpytest("-n1", "-v")
 result.stdout.fnmatch_lines([
-"*FAIL*test_fail_platinfo.py*1*test_func*",
+"*FAIL*test_fail_platinfo.py*test_func*",
 "*0*Python*",
 "*def test_func():",
 ">   assert 0",

diff -r 4c6c3926603135015691bcf537ed8dfe15b59874 -r 
84adc54b0ce93d037ce3cac06a623bce3f599107 testing/test_dsession.py
--- a/testing/test_dsession.py
+++ b/testing/test_dsession.py
@@ -146,6 +146,25 @@
 crashitem = sched.remove_node(node)
 assert crashitem == collection[0]
 
+def test_schedule_different_tests_collected(self):
+"""
+Test that LoadScheduling is logging different tests were
+collected by slaves when that happens.
+"""
+node1 = MockNode()
+node2 = MockNode()
+sched = LoadScheduling(2)
+logged_messages = []
+py.log.setconsumer('loadsched', logged_messages.append)
+sched.addnode(node1)
+sched.addnode(node2)
+sched.addnode_collection(node1, ["a.py::test_1"])
+sched.addnode_collection(node2, ["a.py::test_2"])
+sched.init_distribute()
+logged_content = ''.join(x.content() for x in logged_messages)
+assert 'Different tests were collected between' in logged_content
+assert 'Different tests collected, aborting run' in logged_content
+
 
 class TestDistReporter:
 
@@ -181,7 +200,7 @@
 def test_report_collection_diff_equal():
 """Test reporting of equal collections."""
 from_collection = to_collection = ['aaa', 'bbb', 'ccc']
-assert report_collection_diff(from_collection, to_collection, 1, 2)
+assert report_collection_diff(from_collection, to_collection, 1, 2) is None
 
 
 def test_report_collection_diff_different():
@@ -204,10 +223,8 @@
 '-YYY'
 )
 
-try:
-report_collection_diff(from_collection, to_collection, 1, 2)
-except AssertionError as e:
-assert py.builtin._totext(e) == error_message
+msg = report_collection_diff(from_collection, to_collection, 1, 2)
+assert msg == error_message
 
 @pytest.mark.xfail(reason="duplicate test ids not supported yet")
 def test_pytest_issue419(testdir):

diff -r 4c6c3926603135015691bcf537ed8dfe15b59874 -r 
84adc54b0ce93d037ce3cac06a623bce3f599107 xdist/dsession.py
--- a/xdist/dsession.py
+++ b/xdist/dsession.py
@@ -17,7 +17,7 @@
 if log is None:
 self.log = py.log.Producer("eachsched")
 else:
-self.log = log.loadsched
+self.log = log.eachsched
 self.collection_is_completed = False
 
 def hasnodes(self):
@@ -139,22 +139,17 @@
 def init_distribute(self):
 assert self.collection_is_completed
 # XXX allow nodes to have different collections
-node_collection_items = list(self.node2collection.items())
-first_node, col = node_collection_items[0]
-for node, collection in node_collection_items[1:]:
-report_collection_diff(
-col,
-collection,
-first_node.gateway.id,
-node.gateway.id,
-)
+if not self._check_nodes_have_same_collection():
+self.log('**Different tests collected, aborting run**')
+return
 
 # all collections are the same, good.
 # we now create an index
-self.collection = col
-self.pending[:] = range(len(col))
-if not col:
+self.collection = list(self.node2collection.values())[0]
+self.pending[:] = range(len(self.collection))
+if not self.collection:
 return
+
 # how many items per node do we have about?
 items_per_node = len(self.collection) // len(self.node2pending)
 # take a fraction of tests for initial distribution
@@ -172,17 +167,36 @@