Anonymous avatar Anonymous committed 32a7f2b

Track changes to pytest and xdist.

Name of the session class on the slave changed.

The use of the fnmatch_lines changed.

Comments (0)

Files changed (4)

+include README.txt
+include LICENSE.txt
+include setup.py
+include pytest_cov.py
+include test_pytest_cov.py
     def create_from_session(session):
         name_to_cls = dict(Session=Central,
                            DSession=DistMaster,
-                           SlaveNode=DistSlave)
+                           SlaveSession=DistSlave)
         session_name = session.__class__.__name__
         controller_cls = name_to_cls.get(session_name, Central)
         return controller_cls()
 import setuptools
 
 setuptools.setup(name='pytest-cov',
-                 version='0.7',
+                 version='0.8',
                  description='py.test plugin for coverage reporting with support for both centralised and distributed testing',
                  long_description=open('README.txt').read().strip(),
                  author='Meme Dough',

test_pytest_cov.py

     script = testdir.makepyfile(SCRIPT)
     result = testdir.runpytest(script,
                                '--cov=%s' % script.purebasename)
-    assert result.stdout.fnmatch_lines([
+    result.stdout.fnmatch_lines([
             '*- coverage: platform *, python * -*',
             'test_central * 18 * 5 * 72% *',
             '*10 passed*'
                                '--cov=%s' % script.purebasename,
                                '--dist=load',
                                '--tx=2*popen')
-    assert result.stdout.fnmatch_lines([
+    result.stdout.fnmatch_lines([
             '*- coverage: platform *, python * -*',
             'test_dist_load_collocated * 18 * 5 * 72% *',
             '*10 passed*'
                                '--tx=popen//chdir=%s' % dir1,
                                '--tx=popen//chdir=%s' % dir2,
                                '--rsyncdir=%s' % script.basename)
-    assert result.stdout.fnmatch_lines([
+    result.stdout.fnmatch_lines([
             '*- coverage: platform *, python * -*',
             'test_dist_load_not_collocated * 18 * 5 * 72% *',
             '*10 passed*'
                                '--tx=popen//python=/usr/local/python255/bin/python',
                                '--tx=popen//python=/usr/local/python265/bin/python',
                                '--tx=popen//python=/usr/local/python27b1/bin/python')
-    assert result.stdout.fnmatch_lines([
+    result.stdout.fnmatch_lines([
            '*- coverage: platform *, python 2.4.6-final-0 -*',
            'test_dist_each_many_reports_py2 * 18 * 5 * 72% *',
            '*- coverage: platform *, python 2.5.5-final-0 -*',
                                '--dist=each',
                                '--tx=popen//python=/usr/local/python301/bin/python3.0',
                                '--tx=popen//python=/usr/local/python312/bin/python3.1')
-    assert result.stdout.fnmatch_lines([
+    result.stdout.fnmatch_lines([
             # coverage under python 3.0 seems to produce incorrect
             # results but ignore for this test as we want to see
             # multiple reports regardless of results.
                                '--tx=popen//python=/usr/local/python255/bin/python',
                                '--tx=popen//python=/usr/local/python265/bin/python',
                                '--tx=popen//python=/usr/local/python27b1/bin/python')
-    assert result.stdout.fnmatch_lines([
+    result.stdout.fnmatch_lines([
             '*- coverage -*',
             '* platform *, python 2.4.6-final-0 *',
             '* platform *, python 2.5.5-final-0 *',
                                '--dist=each',
                                '--tx=popen//python=/usr/local/python301/bin/python3.0',
                                '--tx=popen//python=/usr/local/python312/bin/python3.1')
-    assert result.stdout.fnmatch_lines([
+    result.stdout.fnmatch_lines([
             # coverage under python 3.0 seems to produce incorrect
             # results but ignore for this test as we want to see
             # multiple reports regardless of results.
                                '--cov=%s' % script.purebasename,
                                '--dist=load',
                                '--tx=popen//python=/usr/local/env255empty/bin/python')
-    assert result.stdout.fnmatch_lines([
+    result.stdout.fnmatch_lines([
             '*- coverage: failed slaves -*'
             ])
     assert result.ret == 0
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.