diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ dist/ version.txt /.hypothesis/ +/.tox/ diff --git a/requirements-test.txt b/requirements-test.txt --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,3 +1,3 @@ hypothesis -nose +pytest celery diff --git a/swh/scheduler/tests/test_scheduler.py b/swh/scheduler/tests/test_scheduler.py --- a/swh/scheduler/tests/test_scheduler.py +++ b/swh/scheduler/tests/test_scheduler.py @@ -13,7 +13,7 @@ import psycopg2 from arrow import utcnow -from nose.plugins.attrib import attr +import pytest from swh.core.tests.db_testing import SingleDbTestFixture from swh.scheduler import get_scheduler @@ -21,7 +21,7 @@ from . import SQL_DIR -@attr('db') +@pytest.mark.db class CommonSchedulerTest(SingleDbTestFixture): TEST_DB_NAME = 'softwareheritage-scheduler-test' TEST_DB_DUMP = os.path.join(SQL_DIR, '*.sql') diff --git a/swh/scheduler/tests/updater/test_backend.py b/swh/scheduler/tests/updater/test_backend.py --- a/swh/scheduler/tests/updater/test_backend.py +++ b/swh/scheduler/tests/updater/test_backend.py @@ -9,7 +9,7 @@ from arrow import utcnow from hypothesis import given from hypothesis.strategies import sets -from nose.plugins.attrib import attr +import pytest from swh.core.tests.db_testing import SingleDbTestFixture from swh.scheduler.tests import SQL_DIR @@ -19,7 +19,7 @@ from . import from_regex -@attr('db') +@pytest.mark.db class SchedulerUpdaterBackendTest(SingleDbTestFixture, unittest.TestCase): TEST_DB_NAME = 'softwareheritage-scheduler-updater-test' TEST_DB_DUMP = os.path.join(SQL_DIR, 'updater', '*.sql') diff --git a/swh/scheduler/tests/updater/test_writer.py b/swh/scheduler/tests/updater/test_writer.py --- a/swh/scheduler/tests/updater/test_writer.py +++ b/swh/scheduler/tests/updater/test_writer.py @@ -7,7 +7,7 @@ import unittest from glob import glob -from nose.plugins.attrib import attr +import pytest from swh.core.utils import numfile_sortkey as sortkey from swh.core.tests.db_testing import DbTestFixture @@ -18,7 +18,7 @@ from . import UpdaterTestUtil -@attr('db') +@pytest.mark.db class CommonSchedulerTest(DbTestFixture): TEST_SCHED_DB = 'softwareheritage-scheduler-test' TEST_SCHED_DUMP = os.path.join(SQL_DIR, '*.sql') @@ -134,14 +134,14 @@ r = self.scheduler_backend.peek_ready_tasks( 'origin-update-git') - self.assertEquals(len(r), expected_length) + self.assertEqual(len(r), expected_length) # Check the task has been scheduled for t in r: - self.assertEquals(t['type'], 'origin-update-git') - self.assertEquals(t['priority'], 'normal') - self.assertEquals(t['policy'], 'oneshot') - self.assertEquals(t['status'], 'next_run_not_scheduled') + self.assertEqual(t['type'], 'origin-update-git') + self.assertEqual(t['priority'], 'normal') + self.assertEqual(t['policy'], 'oneshot') + self.assertEqual(t['status'], 'next_run_not_scheduled') # writer has nothing to do now self.writer.run() @@ -155,4 +155,4 @@ r = self.scheduler_backend.peek_ready_tasks( 'origin-update-git') - self.assertEquals(len(r), expected_length) + self.assertEqual(len(r), expected_length) diff --git a/swh/scheduler/updater/consumer.py b/swh/scheduler/updater/consumer.py --- a/swh/scheduler/updater/consumer.py +++ b/swh/scheduler/updater/consumer.py @@ -119,7 +119,7 @@ for _event in self.consume_events(): event = self.convert_event(_event) if not event: - self.log.warn( + self.log.warning( 'Incomplete event dropped %s' % _event) continue if not self.is_interesting(event): diff --git a/swh/scheduler/updater/writer.py b/swh/scheduler/updater/writer.py --- a/swh/scheduler/updater/writer.py +++ b/swh/scheduler/updater/writer.py @@ -74,7 +74,7 @@ 'origin-update-git', event['url'], priority='normal') - self.log.warn('Type %s is not supported for now, only git' % ( + self.log.warning('Type %s is not supported for now, only git' % ( event['origin_type'], )) return None diff --git a/tox.ini b/tox.ini new file mode 100644 --- /dev/null +++ b/tox.ini @@ -0,0 +1,17 @@ +[tox] +envlist=flake8,py3 + +[testenv:py3] +deps = + .[testing] + pytest-cov + pifpaf +commands = + pifpaf run postgresql -- pytest --cov=swh --cov-branch {posargs} + +[testenv:flake8] +skip_install = true +deps = + flake8 +commands = + {envpython} -m flake8