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