Adapt unit tests for EXV_ENABLE_FILESYSTEM off

jim-easterbrook · Jul 31, 2024 · d4a1e08 · d4a1e08
1 parent 6b8b7ab
commit d4a1e08
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/tests/test_basicio.py b/tests/test_basicio.py
@@ -52,6 +52,8 @@ def test_CurlIo(self):
         self.assertEqual(io.close(), 0)
         self.assertEqual(io.isopen(), True)
 
+    @unittest.skipUnless(exiv2.versionInfo()['EXV_ENABLE_FILESYSTEM'],
+                         'EXV_ENABLE_FILESYSTEM is off')
     def test_FileIo(self):
         # most functions are tested in test_MemIo
         io = exiv2.ImageFactory.createIo(self.image_path)
@@ -172,6 +174,8 @@ def test_ref_counts(self):
         del io
         self.assertEqual(sys.getrefcount(self.data), 3)
 
+    @unittest.skipUnless(exiv2.versionInfo()['EXV_ENABLE_FILESYSTEM'],
+                         'EXV_ENABLE_FILESYSTEM is off')
     def test_unicode_paths(self):
         cp = locale.getpreferredencoding()
         with tempfile.TemporaryDirectory() as tmp_dir:

diff --git a/tests/test_easyaccess.py b/tests/test_easyaccess.py
@@ -26,7 +26,8 @@ class TestEasyaccessModule(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         test_dir = os.path.dirname(__file__)
-        image = exiv2.ImageFactory.open(os.path.join(test_dir, 'image_02.jpg'))
+        with open(os.path.join(test_dir, 'image_02.jpg'), 'rb') as f:
+            image = exiv2.ImageFactory.open(f.read())
         image.readMetadata()
         cls.exif_data = image.exifData()
 

diff --git a/tests/test_error.py b/tests/test_error.py
@@ -57,9 +57,9 @@ def test_LogMsg(self):
         self.assertEqual(exiv2.LogMsg.handler(), exiv2.LogMsg.pythonHandler)
         # get exiv2 to raise an exception
         with self.assertRaises(exiv2.Exiv2Error) as cm:
-            image = exiv2.ImageFactory.open('non-existing.jpg')
+            image = exiv2.ImageFactory.open(bytes())
         self.assertEqual(cm.exception.code,
-                         exiv2.ErrorCode.kerDataSourceOpenFailed)
+                         exiv2.ErrorCode.kerInputDataReadFailed)
 
 
 if __name__ == '__main__':

diff --git a/tests/test_exif.py b/tests/test_exif.py
@@ -206,6 +206,8 @@ def test_ExifThumb(self):
         thumb.setJpegThumbnail(
             data, exiv2.URational((160, 1)), exiv2.URational((120, 1)), 1)
         self.assertEqual(len(thumb.copy()), 2532)
+        if not exiv2.versionInfo()['EXV_ENABLE_FILESYSTEM']:
+            self.skipTest('EXV_ENABLE_FILESYSTEM is off')
         with tempfile.TemporaryDirectory() as tmp_dir:
             temp_file = os.path.join(tmp_dir, 'thumb')
             self.assertEqual(thumb.writeFile(temp_file), 2532)

diff --git a/tests/test_image.py b/tests/test_image.py
@@ -131,20 +131,22 @@ def test_ImageFactory(self):
             factory.create(int(exiv2.ImageType.jpeg))
         self.assertIsInstance(
             factory.create(exiv2.ImageType.jpeg), exiv2.Image)
+        self.assertIsInstance(factory.createIo(self.image_data), exiv2.BasicIo)
+        self.check_result(factory.getType(self.image_data),
+                          exiv2.ImageType, exiv2.ImageType.jpeg)
+        self.check_result(factory.getType(io),
+                          exiv2.ImageType, exiv2.ImageType.jpeg)
+        self.assertIsInstance(factory.open(self.image_data), exiv2.Image)
+        if not exiv2.versionInfo()['EXV_ENABLE_FILESYSTEM']:
+            self.skipTest('EXV_ENABLE_FILESYSTEM is off')
         with tempfile.TemporaryDirectory() as tmp_dir:
             temp_file = os.path.join(tmp_dir, 'image.jpg')
             self.assertIsInstance(
                 factory.create(exiv2.ImageType.jpeg, temp_file), exiv2.Image)
         self.assertIsInstance(factory.createIo(self.image_path), exiv2.BasicIo)
-        self.assertIsInstance(factory.createIo(self.image_data), exiv2.BasicIo)
         self.check_result(factory.getType(self.image_path),
                           exiv2.ImageType, exiv2.ImageType.jpeg)
-        self.check_result(factory.getType(self.image_data),
-                          exiv2.ImageType, exiv2.ImageType.jpeg)
-        self.check_result(factory.getType(io),
-                          exiv2.ImageType, exiv2.ImageType.jpeg)
         self.assertIsInstance(factory.open(self.image_path), exiv2.Image)
-        self.assertIsInstance(factory.open(self.image_data), exiv2.Image)
 
     def test_ref_counts(self):
         # opening from data keeps reference to buffer

diff --git a/tests/test_preview.py b/tests/test_preview.py
@@ -59,6 +59,8 @@ def test_PreviewImage(self):
         self.check_result(preview.mimeType(), str, 'image/jpeg')
         self.check_result(preview.size(), int, 2532)
         self.check_result(preview.width(), int, 160)
+        if not exiv2.versionInfo()['EXV_ENABLE_FILESYSTEM']:
+            self.skipTest('EXV_ENABLE_FILESYSTEM is off')
         with tempfile.TemporaryDirectory() as tmp_dir:
             temp_file = os.path.join(tmp_dir, 'image.jpg')
             self.assertEqual(preview.writeFile(temp_file), 2532)