diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ version.txt /sql/createdb-stamp /sql/filldb-stamp +.tox/ diff --git a/requirements-test.txt b/requirements-test.txt --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -nose +pytest diff --git a/swh/indexer/tests/storage/test_converters.py b/swh/indexer/tests/storage/test_converters.py --- a/swh/indexer/tests/storage/test_converters.py +++ b/swh/indexer/tests/storage/test_converters.py @@ -5,12 +5,9 @@ import unittest -from nose.plugins.attrib import attr - from swh.indexer.storage import converters -@attr('!db') class TestConverters(unittest.TestCase): def setUp(self): self.maxDiff = None diff --git a/swh/indexer/tests/storage/test_storage.py b/swh/indexer/tests/storage/test_storage.py --- a/swh/indexer/tests/storage/test_storage.py +++ b/swh/indexer/tests/storage/test_storage.py @@ -6,15 +6,16 @@ import os import unittest -from nose.plugins.attrib import attr from swh.model.hashutil import hash_to_bytes from swh.indexer.storage import get_indexer_storage from swh.core.tests.db_testing import SingleDbTestFixture from swh.indexer.tests import SQL_DIR +import pytest -@attr('db') + +@pytest.mark.db class BaseTestStorage(SingleDbTestFixture): """Base test class for most indexer tests. @@ -74,7 +75,7 @@ db.conn.commit() -@attr('db') +@pytest.mark.db class CommonTestStorage(BaseTestStorage): """Base class for Indexer Storage testing. diff --git a/swh/indexer/tests/test_origin_head.py b/swh/indexer/tests/test_origin_head.py --- a/swh/indexer/tests/test_origin_head.py +++ b/swh/indexer/tests/test_origin_head.py @@ -5,7 +5,6 @@ import unittest import logging -from nose.tools import istest from swh.indexer.origin_head import OriginHeadIndexer from swh.indexer.tests.test_utils import MockIndexerStorage, MockStorage @@ -40,7 +39,6 @@ class OriginHead(unittest.TestCase): - @istest def test_git(self): indexer = TestOriginHeadIndexer() indexer.run( @@ -51,7 +49,6 @@ b'\xd7}\xac\xefrm', 'origin_id': 52189575}]) - @istest def test_ftp(self): indexer = TestOriginHeadIndexer() indexer.run( @@ -62,7 +59,6 @@ b'\xcc\x1a\xb4`\x8c\x8by', 'origin_id': 4423668}]) - @istest def test_deposit(self): indexer = TestOriginHeadIndexer() indexer.run( @@ -74,7 +70,6 @@ b'\xa6\xe9\x99\xb1\x9e]q\xeb', 'origin_id': 77775770}]) - @istest def test_pypi(self): indexer = TestOriginHeadIndexer() indexer.run( @@ -85,7 +80,6 @@ b'A\x10\x9d\xc5\xfa2\xf8t', 'origin_id': 85072327}]) - @istest def test_svn(self): indexer = TestOriginHeadIndexer() indexer.run( diff --git a/swh/indexer/tests/test_origin_metadata.py b/swh/indexer/tests/test_origin_metadata.py --- a/swh/indexer/tests/test_origin_metadata.py +++ b/swh/indexer/tests/test_origin_metadata.py @@ -43,22 +43,22 @@ @task -def test_revision_metadata_task(*args, **kwargs): +def revision_metadata_test_task(*args, **kwargs): indexer = TestRevisionMetadataIndexer() indexer.run(*args, **kwargs) return indexer.results @task -def test_origin_intrinsic_metadata_task(*args, **kwargs): +def origin_intrinsic_metadata_test_task(*args, **kwargs): indexer = TestOriginMetadataIndexer() indexer.run(*args, **kwargs) return indexer.results class TestOriginHeadIndexer(TestOriginHeadIndexer): - revision_metadata_task = test_revision_metadata_task - origin_intrinsic_metadata_task = test_origin_intrinsic_metadata_task + revision_metadata_task = revision_metadata_test_task + origin_intrinsic_metadata_task = origin_intrinsic_metadata_test_task class TestOriginMetadata(CeleryTestFixture, unittest.TestCase): 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