diff --git a/py/conftest.py b/py/conftest.py index d93859aba..4a1011f66 100644 --- a/py/conftest.py +++ b/py/conftest.py @@ -1,7 +1,6 @@ pytest_plugins = '_pytest doctest pytester'.split() rsyncdirs = ['../doc'] -rsyncignore = ['c-extension/greenlet/build'] import py class PylibTestconfigPlugin: diff --git a/py/test/plugin/pytest_resultdb.py b/py/test/plugin/pytest_resultdb.py index d70e96dfe..768d9d081 100644 --- a/py/test/plugin/pytest_resultdb.py +++ b/py/test/plugin/pytest_resultdb.py @@ -6,6 +6,8 @@ class ResultdbPlugin: Saves test results to a datastore. + XXX this needs to be merged with resultlog plugin + Also mixes in some early ideas about an archive abstraction for test results. """ @@ -262,7 +264,11 @@ class TestJSONResultArchive(BaseResultArchiveTests): class TestSQLiteResultArchive(BaseResultArchiveTests): cls = SQLiteResultArchive + def setup_method(self, method): + py.test.importorskip("sqlite3") + def test_init_db_sql(self, testdir): + py.test.importorskip("sqlite3") tempdb_path = unicode(testdir.tmpdir.join(self.tempdb)) archive = self.cls(tempdb_path) archive.init_db()