From b210fddf1459fa607a2ffe839a4944fd524c5174 Mon Sep 17 00:00:00 2001
From: David Douard <david.douard@sdfa3.org>
Date: Thu, 18 Oct 2018 14:57:43 +0200
Subject: [PATCH] tests: use pytest instead of nose
related to T1261
---
requirements-test.txt | 2 +-
swh/model/tests/test_cli.py | 4 ++--
swh/model/tests/test_from_disk.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/requirements-test.txt b/requirements-test.txt
index f3c7e8e6..e079f8a6 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1 +1 @@
-nose
+pytest
diff --git a/swh/model/tests/test_cli.py b/swh/model/tests/test_cli.py
index 5d20874e..4f7794c4 100644
--- a/swh/model/tests/test_cli.py
+++ b/swh/model/tests/test_cli.py
@@ -8,14 +8,14 @@ import tempfile
import unittest
from click.testing import CliRunner
-from nose.plugins.attrib import attr
+import pytest
from swh.model import cli
from swh.model.hashutil import hash_to_hex
from swh.model.tests.test_from_disk import DataMixin
-@attr('fs')
+@pytest.mark.fr
class TestIdentify(DataMixin, unittest.TestCase):
def setUp(self):
diff --git a/swh/model/tests/test_from_disk.py b/swh/model/tests/test_from_disk.py
index 2e6c3952..30f543d6 100644
--- a/swh/model/tests/test_from_disk.py
+++ b/swh/model/tests/test_from_disk.py
@@ -8,7 +8,7 @@ import tarfile
import tempfile
import unittest
-from nose.plugins.attrib import attr
+import pytest
from swh.model import from_disk
from swh.model.from_disk import Content, DentryPerms, Directory
@@ -685,7 +685,7 @@ class DirectoryToObjects(DataMixin, unittest.TestCase):
+ 1)
-@attr('fs')
+@pytest.mark.fs
class TarballTest(DataMixin, unittest.TestCase):
def setUp(self):
super().setUp()
--
GitLab