diff --git a/requirements-test.txt b/requirements-test.txt index 145e520..4dfbdaa 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,2 +1,2 @@ -nose +pytest requests-mock diff --git a/swh/core/tests/test_logger.py b/swh/core/tests/test_logger.py index 5180db9..66461a5 100644 --- a/swh/core/tests/test_logger.py +++ b/swh/core/tests/test_logger.py @@ -1,45 +1,45 @@ # Copyright (C) 2015 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information import logging import os import unittest -from nose.plugins.attrib import attr +import pytest from swh.core.logger import PostgresHandler from swh.core.tests.db_testing import SingleDbTestFixture from swh.core.tests import SQL_DIR -@attr('db') +@pytest.mark.db class PgLogHandler(SingleDbTestFixture, unittest.TestCase): TEST_DB_DUMP = os.path.join(SQL_DIR, 'log-schema.sql') def setUp(self): super().setUp() self.modname = 'swh.core.tests.test_logger' self.logger = logging.Logger(self.modname, logging.DEBUG) self.logger.addHandler(PostgresHandler('dbname=' + self.TEST_DB_NAME)) def tearDown(self): logging.shutdown() super().tearDown() def test_log(self): self.logger.info('notice', extra={'swh_type': 'test entry', 'swh_data': 42}) self.logger.warn('warning') with self.conn.cursor() as cur: cur.execute('SELECT level, message, data, src_module FROM log') db_log_entries = cur.fetchall() self.assertIn(('info', 'notice', {'type': 'test entry', 'data': 42}, self.modname), db_log_entries) self.assertIn(('warning', 'warning', {}, self.modname), db_log_entries) diff --git a/tox.ini b/tox.ini index 7a3f221..c0300b7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,23 +1,17 @@ [tox] -envlist=check-manifest,flake8,py3 +envlist=flake8,py3 [testenv:py3] deps = + -r requirements-test.txt + coverage pifpaf - nose commands = - pifpaf run postgresql -- nosetests + pifpaf run postgresql -- pytest {posargs} [testenv:flake8] skip_install = true deps = flake8 commands = {envpython} -m flake8 - -[testenv:check-manifest] -skip_install = true -deps = - check-manifest -commands = - {envpython} -m check_manifest {toxinidir}