|
rdobuilder |
b660ba |
From bed1b63e69b38baa25caf1ebc40571f57d8b759b Mon Sep 17 00:00:00 2001
|
|
rdobuilder |
b660ba |
From: Carl George <carl@george.computer>
|
|
rdobuilder |
b660ba |
Date: Wed, 9 Feb 2022 17:31:27 -0600
|
|
rdobuilder |
b660ba |
Subject: [PATCH] Switch from nose to pytest
|
|
rdobuilder |
b660ba |
|
|
rdobuilder |
b660ba |
This is not a full rewrite to pytest style tests, it just changes the
|
|
rdobuilder |
b660ba |
minimum to allow pytest to run the existing tests.
|
|
rdobuilder |
b660ba |
---
|
|
rdobuilder |
b660ba |
gitdb/test/db/test_pack.py | 4 ++--
|
|
rdobuilder |
b660ba |
gitdb/test/lib.py | 4 ++--
|
|
rdobuilder |
b660ba |
gitdb/test/test_pack.py | 4 ++--
|
|
rdobuilder |
b660ba |
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
rdobuilder |
b660ba |
|
|
rdobuilder |
b660ba |
diff --git a/gitdb/test/db/test_pack.py b/gitdb/test/db/test_pack.py
|
|
rdobuilder |
b660ba |
index 458d804..7959442 100644
|
|
rdobuilder |
b660ba |
--- a/gitdb/test/db/test_pack.py
|
|
rdobuilder |
b660ba |
+++ b/gitdb/test/db/test_pack.py
|
|
rdobuilder |
b660ba |
@@ -16,7 +16,7 @@ import os
|
|
rdobuilder |
b660ba |
import random
|
|
rdobuilder |
b660ba |
import sys
|
|
rdobuilder |
b660ba |
|
|
rdobuilder |
b660ba |
-from nose.plugins.skip import SkipTest
|
|
rdobuilder |
b660ba |
+import pytest
|
|
rdobuilder |
b660ba |
|
|
rdobuilder |
b660ba |
class TestPackDB(TestDBBase):
|
|
rdobuilder |
b660ba |
|
|
rdobuilder |
b660ba |
@@ -24,7 +24,7 @@ class TestPackDB(TestDBBase):
|
|
rdobuilder |
b660ba |
@with_packs_rw
|
|
rdobuilder |
b660ba |
def test_writing(self, path):
|
|
rdobuilder |
b660ba |
if sys.platform == "win32":
|
|
rdobuilder |
b660ba |
- raise SkipTest("FIXME: Currently fail on windows")
|
|
rdobuilder |
b660ba |
+ pytest.skip("FIXME: Currently fail on windows")
|
|
rdobuilder |
b660ba |
|
|
rdobuilder |
b660ba |
pdb = PackedDB(path)
|
|
rdobuilder |
b660ba |
|
|
rdobuilder |
b660ba |
diff --git a/gitdb/test/lib.py b/gitdb/test/lib.py
|
|
rdobuilder |
b660ba |
index a04084f..abd4ad5 100644
|
|
rdobuilder |
b660ba |
--- a/gitdb/test/lib.py
|
|
rdobuilder |
b660ba |
+++ b/gitdb/test/lib.py
|
|
rdobuilder |
b660ba |
@@ -65,8 +65,8 @@ def skip_on_travis_ci(func):
|
|
rdobuilder |
b660ba |
@wraps(func)
|
|
rdobuilder |
b660ba |
def wrapper(self, *args, **kwargs):
|
|
rdobuilder |
b660ba |
if 'TRAVIS' in os.environ:
|
|
rdobuilder |
b660ba |
- import nose
|
|
rdobuilder |
b660ba |
- raise nose.SkipTest("Cannot run on travis-ci")
|
|
rdobuilder |
b660ba |
+ import pytest
|
|
rdobuilder |
b660ba |
+ pytest.skip("Cannot run on travis-ci")
|
|
rdobuilder |
b660ba |
# end check for travis ci
|
|
rdobuilder |
b660ba |
return func(self, *args, **kwargs)
|
|
rdobuilder |
b660ba |
# end wrapper
|
|
rdobuilder |
b660ba |
diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
|
|
rdobuilder |
b660ba |
index 48a1852..81a6bfc 100644
|
|
rdobuilder |
b660ba |
--- a/gitdb/test/test_pack.py
|
|
rdobuilder |
b660ba |
+++ b/gitdb/test/test_pack.py
|
|
rdobuilder |
b660ba |
@@ -26,7 +26,7 @@ from gitdb.fun import delta_types
|
|
rdobuilder |
b660ba |
from gitdb.exc import UnsupportedOperation
|
|
rdobuilder |
b660ba |
from gitdb.util import to_bin_sha
|
|
rdobuilder |
b660ba |
|
|
rdobuilder |
b660ba |
-from nose import SkipTest
|
|
rdobuilder |
b660ba |
+import pytest
|
|
rdobuilder |
b660ba |
|
|
rdobuilder |
b660ba |
import os
|
|
rdobuilder |
b660ba |
import tempfile
|
|
rdobuilder |
b660ba |
@@ -246,4 +246,4 @@ class TestPack(TestBase):
|
|
rdobuilder |
b660ba |
def test_pack_64(self):
|
|
rdobuilder |
b660ba |
# TODO: hex-edit a pack helping us to verify that we can handle 64 byte offsets
|
|
rdobuilder |
b660ba |
# of course without really needing such a huge pack
|
|
rdobuilder |
b660ba |
- raise SkipTest()
|
|
rdobuilder |
b660ba |
+ pytest.skip('not implemented')
|
|
rdobuilder |
b660ba |
--
|
|
rdobuilder |
b660ba |
2.34.1
|
|
rdobuilder |
b660ba |
|