diff --git a/swh/loader/core/tests/test_converters.py b/swh/loader/core/tests/test_converters.py --- a/swh/loader/core/tests/test_converters.py +++ b/swh/loader/core/tests/test_converters.py @@ -8,10 +8,8 @@ import unittest from unittest.mock import Mock -from nose.tools import istest - -from swh.model.from_disk import Content from swh.loader.core import converters +from swh.model.from_disk import Content def tmpfile_with_content(fromdir, contentfile): @@ -41,8 +39,7 @@ def tearDown(self): self.tmpdir.cleanup() - @istest - def content_for_storage_path(self): + def test_content_for_storage_path(self): # given data = b'temp file for testing content storage conversion' tmpfile = tmpfile_with_content(self.tmpdir.name, data) @@ -60,8 +57,7 @@ # then self.assertEqual(content, expected_content) - @istest - def content_for_storage_data(self): + def test_content_for_storage_data(self): # given data = b'temp file for testing content storage conversion' @@ -76,8 +72,7 @@ # then self.assertEqual(content, expected_content) - @istest - def content_for_storage_too_long(self): + def test_content_for_storage_too_long(self): # given data = b'temp file for testing content storage conversion' diff --git a/swh/loader/core/tests/test_queue.py b/swh/loader/core/tests/test_queue.py --- a/swh/loader/core/tests/test_queue.py +++ b/swh/loader/core/tests/test_queue.py @@ -5,16 +5,13 @@ import unittest -from nose.tools import istest - -from swh.loader.core.queue import QueuePerNbElements -from swh.loader.core.queue import QueuePerNbUniqueElements -from swh.loader.core.queue import QueuePerSizeAndNbUniqueElements +from swh.loader.core.queue import (QueuePerNbElements, + QueuePerNbUniqueElements, + QueuePerSizeAndNbUniqueElements) class TestQueuePerNbElements(unittest.TestCase): - @istest - def simple_queue_behavior(self): + def test_simple_queue_behavior(self): max_nb_elements = 10 queue = QueuePerNbElements(max_nb_elements=max_nb_elements) @@ -48,8 +45,7 @@ class TestQueuePerNbUniqueElements(unittest.TestCase): - @istest - def queue_with_unique_key_behavior(self): + def test_queue_with_unique_key_behavior(self): max_nb_elements = 5 queue = QueuePerNbUniqueElements(max_nb_elements=max_nb_elements, key='id') @@ -86,8 +82,7 @@ class TestQueuePerSizeAndNbUniqueElements(unittest.TestCase): - @istest - def queue_with_unique_key_and_size_behavior(self): + def test_queue_with_unique_key_and_size_behavior(self): max_nb_elements = 5 max_size = 100 queue = QueuePerSizeAndNbUniqueElements(