Replace existing run_tests.py script with a pytest script

The existing run_test.py script is quite old, a bit restrictive, and
doesn't always behave as documented. The pytest testing tool is mature,
well documented, and maintained.

The run_tests.py script is generating by installing py.test and running:

    py.tests --genscript=run_tests.py

Note: to generate a script that is compatible with python2.6 the command
needs to be run using python2.6

Author: jerrykan

run_tests.py

@@ -20,6 +20,7 @@
 import gpgmelib
 from email.parser import FeedParser
 
+import pytest
 from roundup.hyperdb import String, Password, Link, Multilink, Date, \
     Interval, DatabaseError, Boolean, Number, Node
 from roundup.mailer import Mailer
@@ -2019,14 +2020,12 @@ def dummy_snd(s, to, msg, res=res) :
             roundupdb._ = old_translate_
             Mailer.smtp_send = backup
 
+    @pytest.mark.skipif(gpgmelib.pyme is None, reason='Skipping PGPNosy test')
     def testPGPNosyMail(self) :
         """Creates one issue with two attachments, one smaller and one larger
            than the set max_attachment_size. Recipients are one with and
            one without encryption enabled via a gpg group.
         """
-        if gpgmelib.pyme is None:
-            print "Skipping PGPNosy test"
-            return
         old_translate_ = roundupdb._
         roundupdb._ = i18n.get_translation(language='C').gettext
         db = self.db

test/db_test_base.py

@@ -20,10 +20,19 @@
 import datetime
 import calendar
 
+import pytest
 from roundup import date, i18n
 from roundup.date import Date, Interval, Range, fixTimeOverflow, \
     get_timezone
 
+try:
+    import pytz
+    SKIP_PYTZ = False
+except ImportError:
+    SKIP_PYTZ = True
+
+skip_pytz = pytest.mark.skipif(SKIP_PYTZ, reason="'pytz' not installed")
+
 
 class DateTestCase(unittest.TestCase):
     def setUp(self):
@@ -452,6 +461,8 @@ def testTimestamp(self):
         ae (date.timestamp(), -61125753600.0)
         ae(str(date), '0033-01-01.00:00:00')
 
+
+@skip_pytz
 class TimezoneTestCase(unittest.TestCase):
 
     def testTZ(self):

test/test_dates.py

@@ -20,15 +20,27 @@
 
 import os, unittest, shutil
 
+import pytest
 from roundup.backends import get_backend, have_backend
 from roundup.backends.indexer_rdbms import Indexer
 
 # borrow from other tests
 from db_test_base import setupSchema, config
-from test_postgresql import postgresqlOpener
-from test_mysql import mysqlOpener
+from .test_postgresql import postgresqlOpener, skip_postgresql
+from .test_mysql import mysqlOpener, skip_mysql
 from test_sqlite import sqliteOpener
 
+try:
+    import xapian
+    SKIP_XAPIAN = False
+except ImportError:
+    SKIP_XAPIAN = True
+
+skip_xapian = pytest.mark.skipif(
+    SKIP_XAPIAN,
+    reason="Skipping Xapian indexer tests: 'xapian' not installed")
+
+
 class db:
     class config(dict):
         DATABASE = 'test-index'
@@ -139,6 +151,8 @@ def test_manyresults(self):
     def tearDown(self):
         shutil.rmtree('test-index')
 
+
+@skip_xapian
 class XapianIndexerTest(IndexerTest):
     def setUp(self):
         if os.path.exists('test-index'):
@@ -164,6 +178,7 @@ def tearDown(self):
             shutil.rmtree(config.DATABASE)
 
 
+@skip_postgresql
 class postgresqlIndexerTest(postgresqlOpener, RDBMSIndexerTest, IndexerTest):
     def setUp(self):
         postgresqlOpener.setUp(self)
@@ -173,6 +188,7 @@ def tearDown(self):
         postgresqlOpener.tearDown(self)
 
 
+@skip_mysql
 class mysqlIndexerTest(mysqlOpener, RDBMSIndexerTest, IndexerTest):
     def setUp(self):
         mysqlOpener.setUp(self)

test/test_indexer.py

@@ -15,10 +15,16 @@
 import gpgmelib
 import unittest, tempfile, os, shutil, errno, imp, sys, difflib, time
 
+import pytest
+
 try:
     import pyme, pyme.core
+    SKIP_PGP = False
 except ImportError:
-    pyme = None
+    SKIP_PGP = True
+
+skip_pgp = pytest.mark.skipif(
+    SKIP_PGP, reason="Skipping PGP tests: 'pyme' not installed")
 
 
 from cStringIO import StringIO
@@ -3263,6 +3269,7 @@ def testForwardedMessageAttachment(self):
         self.assertEqual(self.db.file.get(fileid, 'type'), 'message/rfc822')
 
 
+@skip_pgp
 class MailgwPGPTestCase(MailgwTestAbstractBase, unittest.TestCase):
     pgphome = gpgmelib.pgphome
     def setUp(self):

test/test_mailgw.py

@@ -17,6 +17,7 @@
 
 import unittest, os, shutil, time, imp
 
+import pytest
 from roundup.hyperdb import DatabaseError
 from roundup.backends import get_backend, have_backend
 
@@ -39,24 +40,44 @@ def nuke_database(self):
         self.module.db_nuke(config)
 
 
+if not have_backend('mysql'):
+    SKIP_MYSQL = True
+    SKIP_MYSQL_REASON = 'Skipping MySQL tests: not enabled'
+else:
+    try:
+        import MySQLdb
+        mysqlOpener.module.db_exists(config)
+        SKIP_MYSQL = False
+        SKIP_MYSQL_REASON = ''
+    except (MySQLdb.MySQLError, DatabaseError) as msg:
+        SKIP_MYSQL = True
+        SKIP_MYSQL_REASON = 'Skipping MySQL tests: %s' % str(msg)
+
+skip_mysql = pytest.mark.skipif(SKIP_MYSQL, reason=SKIP_MYSQL_REASON)
+
+
+@skip_mysql
 class mysqlDBTest(mysqlOpener, DBTest, unittest.TestCase):
     def setUp(self):
         mysqlOpener.setUp(self)
         DBTest.setUp(self)
 
 
+@skip_mysql
 class mysqlROTest(mysqlOpener, ROTest, unittest.TestCase):
     def setUp(self):
         mysqlOpener.setUp(self)
         ROTest.setUp(self)
 
 
+@skip_mysql
 class mysqlSchemaTest(mysqlOpener, SchemaTest, unittest.TestCase):
     def setUp(self):
         mysqlOpener.setUp(self)
         SchemaTest.setUp(self)
 
 
+@skip_mysql
 class mysqlClassicInitTest(mysqlOpener, ClassicInitTest, unittest.TestCase):
     backend = 'mysql'
     def setUp(self):
@@ -67,6 +88,7 @@ def tearDown(self):
         self.nuke_database()
 
 
+@skip_mysql
 class mysqlConcurrencyTest(mysqlOpener, ConcurrentDBTest, unittest.TestCase):
     backend = 'mysql'
     def setUp(self):
@@ -77,6 +99,7 @@ def tearDown(self):
         self.nuke_database()
 
 
+@skip_mysql
 class mysqlHTMLItemTest(mysqlOpener, HTMLItemTest, unittest.TestCase):
     backend = 'mysql'
     def setUp(self):
@@ -87,6 +110,7 @@ def tearDown(self):
         self.nuke_database()
 
 
+@skip_mysql
 class mysqlFilterCacheTest(mysqlOpener, FilterCacheTest, unittest.TestCase):
     backend = 'mysql'
     def setUp(self):
@@ -98,6 +122,7 @@ def tearDown(self):
 
 
 from session_common import RDBMSTest
+@skip_mysql
 class mysqlSessionTest(mysqlOpener, RDBMSTest, unittest.TestCase):
     def setUp(self):
         mysqlOpener.setUp(self)

test/test_mysql.py

@@ -17,6 +17,7 @@
 
 import unittest
 
+import pytest
 from roundup.hyperdb import DatabaseError
 
 from db_test_base import DBTest, ROTest, config, SchemaTest, ClassicInitTest
@@ -25,6 +26,15 @@
 
 from roundup.backends import get_backend, have_backend
 
+if not have_backend('postgresql'):
+    SKIP_POSTGRESQL = True
+else:
+    SKIP_POSTGRESQL = False
+
+skip_postgresql = pytest.mark.skipif(
+    SKIP_POSTGRESQL, reason='Skipping PostgreSQL tests: not enabled')
+
+
 class postgresqlOpener:
     if have_backend('postgresql'):
         module = get_backend('postgresql')
@@ -40,6 +50,7 @@ def nuke_database(self):
         self.module.db_nuke(config)
 
 
+@skip_postgresql
 class postgresqlDBTest(postgresqlOpener, DBTest, unittest.TestCase):
     def setUp(self):
         postgresqlOpener.setUp(self)
@@ -50,6 +61,7 @@ def tearDown(self):
         postgresqlOpener.tearDown(self)
 
 
+@skip_postgresql
 class postgresqlROTest(postgresqlOpener, ROTest, unittest.TestCase):
     def setUp(self):
         postgresqlOpener.setUp(self)
@@ -60,6 +72,7 @@ def tearDown(self):
         postgresqlOpener.tearDown(self)
 
 
+@skip_postgresql
 class postgresqlConcurrencyTest(postgresqlOpener, ConcurrentDBTest,
                                 unittest.TestCase):
     backend = 'postgresql'
@@ -72,6 +85,7 @@ def tearDown(self):
         postgresqlOpener.tearDown(self)
 
 
+@skip_postgresql
 class postgresqlJournalTest(postgresqlOpener, ClassicInitBase,
                             unittest.TestCase):
     backend = 'postgresql'
@@ -122,6 +136,7 @@ def testConcurrentRepeatableRead(self):
         self.assertRaises(exc, self._test_journal, [])
 
 
+@skip_postgresql
 class postgresqlHTMLItemTest(postgresqlOpener, HTMLItemTest,
                              unittest.TestCase):
     backend = 'postgresql'
@@ -134,6 +149,7 @@ def tearDown(self):
         postgresqlOpener.tearDown(self)
 
 
+@skip_postgresql
 class postgresqlFilterCacheTest(postgresqlOpener, FilterCacheTest,
                                 unittest.TestCase):
     backend = 'postgresql'
@@ -146,6 +162,7 @@ def tearDown(self):
         postgresqlOpener.tearDown(self)
 
 
+@skip_postgresql
 class postgresqlSchemaTest(postgresqlOpener, SchemaTest, unittest.TestCase):
     def setUp(self):
         postgresqlOpener.setUp(self)
@@ -156,6 +173,7 @@ def tearDown(self):
         postgresqlOpener.tearDown(self)
 
 
+@skip_postgresql
 class postgresqlClassicInitTest(postgresqlOpener, ClassicInitTest,
                                 unittest.TestCase):
     backend = 'postgresql'
@@ -169,6 +187,7 @@ def tearDown(self):
 
 
 from session_common import RDBMSTest
+@skip_postgresql
 class postgresqlSessionTest(postgresqlOpener, RDBMSTest, unittest.TestCase):
     def setUp(self):
         postgresqlOpener.setUp(self)

test/test_postgresql.py

@@ -1,5 +1,10 @@
 import os, unittest, shutil
+
+import pytest
+
 from db_test_base import setupTracker
+from .test_dates import skip_pytz
+
 
 class UserAuditorTest(unittest.TestCase):
     def setUp(self):
@@ -8,12 +13,6 @@ def setUp(self):
         self.db = self.instance.open('admin')
         self.db.tx_Source = "cli"
 
-        try:
-            import pytz
-            self.pytz = True
-        except ImportError:
-            self.pytz = False
-
         self.db.user.create(username='kyle', address='[email protected]',
             realname='Kyle Broflovski', roles='User')
 
@@ -34,19 +33,21 @@ def testBadTimezones(self):
         self.assertRaises(ValueError, self.db.user.set, userid, timezone='-24')
         self.assertRaises(ValueError, self.db.user.set, userid, timezone='-3000')
 
-        if self.pytz:
-            try:
-                from pytz import UnknownTimeZoneError
-            except:
-                UnknownTimeZoneError = ValueError
-            self.assertRaises(UnknownTimeZoneError, self.db.user.set, userid, timezone='MiddleOf/Nowhere')
+    @skip_pytz
+    def testBadTimezonesPyTZ(self):
+        userid = self.db.user.lookup('kyle')
+
+        try:
+            from pytz import UnknownTimeZoneError
+        except:
+            UnknownTimeZoneError = ValueError
+
+        self.assertRaises(UnknownTimeZoneError, self.db.user.set, userid,
+                          timezone='MiddleOf/Nowhere')
 
     def testGoodTimezones(self):
         self.db.user.create(username='test_user01', timezone='12')
 
-        if self.pytz:
-            self.db.user.create(username='test_user02', timezone='MST')
-
         userid = self.db.user.lookup('kyle')
 
         # TODO: roundup should accept non-integer offsets since those are valid
@@ -57,8 +58,12 @@ def testGoodTimezones(self):
         self.db.user.set(userid, timezone='23')
         self.db.user.set(userid, timezone='0')
 
-        if self.pytz:
-            self.db.user.set(userid, timezone='US/Eastern')
+    @skip_pytz
+    def testGoodTimezonesPyTZ(self):
+        userid = self.db.user.lookup('kyle')
+
+        self.db.user.create(username='test_user02', timezone='MST')
+        self.db.user.set(userid, timezone='US/Eastern')
 
     def testBadEmailAddresses(self):
         userid = self.db.user.lookup('kyle')