[py-svn] commit/pytest: hpk42: fix pytest-xdist breakage

[Bitbucket]

1 new changeset in pytest:

http://bitbucket.org/hpk42/pytest/changeset/9ae391446a4c/
changeset:   9ae391446a4c
user:        hpk42
date:        2011-07-05 18:01:31
summary:     fix pytest-xdist breakage
affected #:  3 files (168 bytes)

--- a/_pytest/__init__.py	Tue Jul 05 17:29:53 2011 +0200
+++ b/_pytest/__init__.py	Tue Jul 05 18:01:31 2011 +0200
@@ -1,2 +1,2 @@
 #
-__version__ = '2.1.0.dev6'
+__version__ = '2.1.0.dev7'


--- a/_pytest/assertion/__init__.py	Tue Jul 05 17:29:53 2011 +0200
+++ b/_pytest/assertion/__init__.py	Tue Jul 05 18:01:31 2011 +0200
@@ -68,7 +68,10 @@
     if hook is not None:
         sys.meta_path.remove(hook)
 
-def pytest_sessionstart(session):
+def pytest_collection(session):
+    # this hook is only called when test modules are collected
+    # so for example not in the master process of pytest-xdist
+    # (which does not collect test modules)
     hook = session.config._assertstate.hook
     if hook is not None:
         hook.set_session(session)


--- a/setup.py	Tue Jul 05 17:29:53 2011 +0200
+++ b/setup.py	Tue Jul 05 18:01:31 2011 +0200
@@ -22,7 +22,7 @@
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.1.0.dev6',
+        version='2.1.0.dev7',
         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.