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