Improved work-around for pytest markers bug

The previous fix was only a partial solution. Any test class sharing a
parent with, and appearing after, a skipped test class was being skipped
(not just other test classes using the skip/skipif marker).  Now only
tests that should be skipped will be skipped, the rest should run as
normal.

Author: jerrykan

test/pytest_patcher.py

@@ -0,0 +1,32 @@
+"""
+The following code was taken from:
+
+    https://github.com/pytest-dev/pytest/issues/568#issuecomment-216569420
+
+to resolve a bug with using pytest.mark.skip(). Once the bug is resolved in
+pytest this file can be removed along with all the wrapper mark_class()
+references in the other test files.
+"""
+import types
+
+
+def mark_class(marker):
+    '''Workaround for https://github.com/pytest-dev/pytest/issues/568'''
+    def copy_func(f):
+        try:
+            return types.FunctionType(f.__code__, f.__globals__,
+                                      name=f.__name__, argdefs=f.__defaults__,
+                                      closure=f.__closure__)
+        except AttributeError:
+            return types.FunctionType(f.func_code, f.func_globals,
+                                      name=f.func_name,
+                                      argdefs=f.func_defaults,
+                                      closure=f.func_closure)
+
+    def mark(cls):
+        for method in dir(cls):
+            if method.startswith('test_'):
+                f = copy_func(getattr(cls, method))
+                setattr(cls, method, marker(f))
+        return cls
+    return mark

test/test_dates.py

@@ -25,13 +25,14 @@
 from roundup.date import Date, Interval, Range, fixTimeOverflow, \
     get_timezone
 
-# FIX: workaround for a bug in pytest.mark.skipif():
-#   https://github.com/pytest-dev/pytest/issues/568
 try:
     import pytz
     skip_pytz = lambda func, *args, **kwargs: func
 except ImportError:
-    skip_pytz = pytest.mark.skip(reason="'pytz' not installed")
+    # FIX: workaround for a bug in pytest.mark.skip():
+    #   https://github.com/pytest-dev/pytest/issues/568
+    from .pytest_patcher import mark_class
+    skip_pytz = mark_class(pytest.mark.skip(reason="'pytz' not installed"))
 
 
 class DateTestCase(unittest.TestCase):

test/test_indexer.py

@@ -30,21 +30,25 @@
 from .test_mysql import mysqlOpener, skip_mysql
 from test_sqlite import sqliteOpener
 
-# FIX: workaround for a bug in pytest.mark.skipif():
-#   https://github.com/pytest-dev/pytest/issues/568
 try:
     import xapian
     skip_xapian = lambda func, *args, **kwargs: func
 except ImportError:
-    skip_xapian = pytest.mark.skip(
-        "Skipping Xapian indexer tests: 'xapian' not installed")
+    # FIX: workaround for a bug in pytest.mark.skip():
+    #   https://github.com/pytest-dev/pytest/issues/568
+    from .pytest_patcher import mark_class
+    skip_xapian = mark_class(pytest.mark.skip(
+        "Skipping Xapian indexer tests: 'xapian' not installed"))
 
 try:
     import whoosh
     skip_whoosh = lambda func, *args, **kwargs: func
 except ImportError:
-    skip_whoosh = pytest.mark.skip(
-        "Skipping Whoosh indexer tests: 'whoosh' not installed")
+    # FIX: workaround for a bug in pytest.mark.skip():
+    #   https://github.com/pytest-dev/pytest/issues/568
+    from .pytest_patcher import mark_class
+    skip_whoosh = mark_class(pytest.mark.skip(
+        "Skipping Whoosh indexer tests: 'whoosh' not installed"))
 
 
 class db:

test/test_mailgw.py

@@ -17,14 +17,15 @@
 
 import pytest
 
-# FIX: workaround for a bug in pytest.mark.skipif():
-#   https://github.com/pytest-dev/pytest/issues/568
 try:
     import pyme, pyme.core
     skip_pgp = lambda func, *args, **kwargs: func
 except ImportError:
-    skip_pgp = pytest.mark.skip(
-        reason="Skipping PGP tests: 'pyme' not installed")
+    # FIX: workaround for a bug in pytest.mark.skip():
+    #   https://github.com/pytest-dev/pytest/issues/568
+    from .pytest_patcher import mark_class
+    skip_pgp = mark_class(pytest.mark.skip(
+        reason="Skipping PGP tests: 'pyme' not installed"))
 
 
 from cStringIO import StringIO

test/test_mysql.py

@@ -40,19 +40,21 @@ def nuke_database(self):
         self.module.db_nuke(config)
 
 
-# FIX: workaround for a bug in pytest.mark.skipif():
+# FIX: workaround for a bug in pytest.mark.skip():
 #   https://github.com/pytest-dev/pytest/issues/568
+from .pytest_patcher import mark_class
+
 if not have_backend('mysql'):
-    skip_mysql = pytest.mark.skip(
-        reason='Skipping MySQL tests: backend not available')
+    skip_mysql = mark_class(pytest.mark.skip(
+        reason='Skipping MySQL tests: backend not available'))
 else:
     try:
         import MySQLdb
         mysqlOpener.module.db_exists(config)
         skip_mysql = lambda func, *args, **kwargs: func
     except (MySQLdb.MySQLError, DatabaseError) as msg:
-        skip_mysql = pytest.mark.skip(
-            reason='Skipping MySQL tests: %s' % str(msg))
+        skip_mysql = mark_class(pytest.mark.skip(
+            reason='Skipping MySQL tests: %s' % str(msg)))
 
 
 @skip_mysql

test/test_postgresql.py

@@ -26,11 +26,12 @@
 
 from roundup.backends import get_backend, have_backend
 
-# FIX: workaround for a bug in pytest.mark.skipif():
-#   https://github.com/pytest-dev/pytest/issues/568
 if not have_backend('postgresql'):
-    skip_postgresql = pytest.mark.skip(
-        reason='Skipping PostgreSQL tests: backend not available')
+    # FIX: workaround for a bug in pytest.mark.skip():
+    #   https://github.com/pytest-dev/pytest/issues/568
+    from .pytest_patcher import mark_class
+    skip_postgresql = mark_class(pytest.mark.skip(
+        reason='Skipping PostgreSQL tests: backend not available'))
 else:
     skip_postgresql = lambda func, *args, **kwargs: func