Fix work-around for pytest markers bug

The initial work-around implemented was totally botched using
'pytest.skip' instead of 'pytest.mark.skip' which resulted in all tests
in a file being completely ignored if any skip conditions that evaluated
to true were declared or imported in the file.

This work-around will not correctly display why all the tests have been
skipped when using the '-rs' parameter. Only the first skip marker to
taint a parent test class will be displayed (ie. if both xapian and
mysql tests are being skipped, pytest will only output that tests are
being skipped because xapian is not installed even though the mysql
tests are also being skipped because mysql backend is not available).

There also seems to be a bug in the current version of pytest being used
in 'run_tests.py' (v2.8.4) that results in the skip not actually working
when using 'pytest.mark.skip'. This does work correctly with the most
recent release (v2.9.2), so the 'run_tests.py' script will need to be
updated.

Author: jerrykan

test/test_dates.py

@@ -31,7 +31,7 @@
     import pytz
     skip_pytz = lambda func, *args, **kwargs: func
 except ImportError:
-    skip_pytz = pytest.skip("'pytz' not installed")
+    skip_pytz = pytest.mark.skip(reason="'pytz' not installed")
 
 
 class DateTestCase(unittest.TestCase):

test/test_indexer.py

@@ -36,16 +36,17 @@
     import xapian
     skip_xapian = lambda func, *args, **kwargs: func
 except ImportError:
-    skip_xapian = pytest.skip(
+    skip_xapian = 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.skip(
+    skip_whoosh = pytest.mark.skip(
         "Skipping Whoosh indexer tests: 'whoosh' not installed")
 
+
 class db:
     class config(dict):
         DATABASE = 'test-index'

test/test_mailgw.py

@@ -23,7 +23,8 @@
     import pyme, pyme.core
     skip_pgp = lambda func, *args, **kwargs: func
 except ImportError:
-    skip_pgp = pytest.skip("Skipping PGP tests: 'pyme' not installed")
+    skip_pgp = pytest.mark.skip(
+        reason="Skipping PGP tests: 'pyme' not installed")
 
 
 from cStringIO import StringIO

test/test_mysql.py

@@ -43,14 +43,16 @@ def nuke_database(self):
 # FIX: workaround for a bug in pytest.mark.skipif():
 #   https://github.com/pytest-dev/pytest/issues/568
 if not have_backend('mysql'):
-    skip_mysql = pytest.skip('Skipping MySQL tests: backend not available')
+    skip_mysql = 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.skip('Skipping MySQL tests: %s' % str(msg))
+        skip_mysql = pytest.mark.skip(
+            reason='Skipping MySQL tests: %s' % str(msg))
 
 
 @skip_mysql

test/test_postgresql.py

@@ -29,8 +29,8 @@
 # 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.skip(
-        'Skipping PostgreSQL tests: backend not available')
+    skip_postgresql = pytest.mark.skip(
+        reason='Skipping PostgreSQL tests: backend not available')
 else:
     skip_postgresql = lambda func, *args, **kwargs: func
 

test/test_userauditor.py

@@ -1,7 +1,5 @@
 import os, unittest, shutil
 
-import pytest
-
 from db_test_base import setupTracker
 from .test_dates import skip_pytz
 

test/test_xmlrpc.py

@@ -6,7 +6,6 @@
 
 import unittest, os, shutil, errno, sys, difflib, cgi, re
 
-import pytest
 from xmlrpclib import MultiCall
 from roundup.cgi.exceptions import *
 from roundup import init, instance, password, hyperdb, date