Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
swh-model
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Renaud Boyer
swh-model
Commits
b210fddf
Commit
b210fddf
authored
6 years ago
by
David Douard
Browse files
Options
Downloads
Patches
Plain Diff
tests: use pytest instead of nose
related to T1261
parent
7af882ad
No related branches found
Branches containing commit
Tags
debian/0.10.0-1_swh1_bpo10+1
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
requirements-test.txt
+1
-1
1 addition, 1 deletion
requirements-test.txt
swh/model/tests/test_cli.py
+2
-2
2 additions, 2 deletions
swh/model/tests/test_cli.py
swh/model/tests/test_from_disk.py
+2
-2
2 additions, 2 deletions
swh/model/tests/test_from_disk.py
with
5 additions
and
5 deletions
requirements-test.txt
+
1
−
1
View file @
b210fddf
nose
pytest
This diff is collapsed.
Click to expand it.
swh/model/tests/test_cli.py
+
2
−
2
View file @
b210fddf
...
@@ -8,14 +8,14 @@ import tempfile
...
@@ -8,14 +8,14 @@ import tempfile
import
unittest
import
unittest
from
click.testing
import
CliRunner
from
click.testing
import
CliRunner
from
nose.plugins.attrib
import
attr
import
pytest
from
swh.model
import
cli
from
swh.model
import
cli
from
swh.model.hashutil
import
hash_to_hex
from
swh.model.hashutil
import
hash_to_hex
from
swh.model.tests.test_from_disk
import
DataMixin
from
swh.model.tests.test_from_disk
import
DataMixin
@
attr
(
'
fs
'
)
@
pytest.mark.fr
class
TestIdentify
(
DataMixin
,
unittest
.
TestCase
):
class
TestIdentify
(
DataMixin
,
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
...
...
This diff is collapsed.
Click to expand it.
swh/model/tests/test_from_disk.py
+
2
−
2
View file @
b210fddf
...
@@ -8,7 +8,7 @@ import tarfile
...
@@ -8,7 +8,7 @@ import tarfile
import
tempfile
import
tempfile
import
unittest
import
unittest
from
nose.plugins.attrib
import
attr
import
pytest
from
swh.model
import
from_disk
from
swh.model
import
from_disk
from
swh.model.from_disk
import
Content
,
DentryPerms
,
Directory
from
swh.model.from_disk
import
Content
,
DentryPerms
,
Directory
...
@@ -685,7 +685,7 @@ class DirectoryToObjects(DataMixin, unittest.TestCase):
...
@@ -685,7 +685,7 @@ class DirectoryToObjects(DataMixin, unittest.TestCase):
+
1
)
+
1
)
@
attr
(
'
fs
'
)
@
pytest.mark.fs
class
TarballTest
(
DataMixin
,
unittest
.
TestCase
):
class
TarballTest
(
DataMixin
,
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
super
().
setUp
()
super
().
setUp
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment