disabled unneeded xfails

Author: tclose

extras/fileformats/extras/application/tests/test_application_serialization.py

@@ -1,5 +1,5 @@
-import sys
-import pytest
+# import sys
+# import pytest
 from fileformats.application import Json, Yaml
 
 
@@ -28,10 +28,10 @@
 """
 
 
-@pytest.mark.xfail(
-    sys.version_info.minor <= 9,
-    reason="upstream Pydra issue with type-checking 'type' objects",
-)
+# @pytest.mark.xfail(
+#     sys.version_info.minor <= 9,
+#     reason="upstream Pydra issue with type-checking 'type' objects",
+# )
 def test_json_to_yaml(work_dir):
     in_file = work_dir / "test.json"
     with open(in_file, "w") as f:
@@ -41,10 +41,10 @@ def test_json_to_yaml(work_dir):
     assert yml.contents == SAMPLE_YAML
 
 
-@pytest.mark.xfail(
-    sys.version_info.minor <= 9,
-    reason="upstream Pydra issue with type-checking 'type' objects",
-)
+# @pytest.mark.xfail(
+#     sys.version_info.minor <= 9,
+#     reason="upstream Pydra issue with type-checking 'type' objects",
+# )
 def test_yaml_to_json(work_dir):
     in_file = work_dir / "test.yaml"
     with open(in_file, "w") as f:

extras/fileformats/extras/image/tests/test_image_converters.py

@@ -1,4 +1,4 @@
-import sys
+# import sys
 import pytest
 from imageio.core.fetching import get_remote_file
 from fileformats.image import Bitmap, Gif, Jpeg, Png, Tiff
@@ -15,25 +15,25 @@ def png() -> Png:
     return Png(get_remote_file("images/chelsea.png"))
 
 
-@pytest.mark.xfail(
-    sys.version_info.minor <= 9,
-    reason="upstream Pydra issue with type-checking 'type' objects",
-)
+# @pytest.mark.xfail(
+#     sys.version_info.minor <= 9,
+#     reason="upstream Pydra issue with type-checking 'type' objects",
+# )
 def test_jpg_to_gif(jpg):
     Gif.convert(jpg)
 
 
-@pytest.mark.xfail(
-    sys.version_info.minor <= 9,
-    reason="upstream Pydra issue with type-checking 'type' objects",
-)
+# @pytest.mark.xfail(
+#     sys.version_info.minor <= 9,
+#     reason="upstream Pydra issue with type-checking 'type' objects",
+# )
 def test_png_to_tiff(png):
     Tiff.convert(png)
 
 
-@pytest.mark.xfail(
-    sys.version_info.minor <= 9,
-    reason="upstream Pydra issue with type-checking 'type' objects",
-)
+# @pytest.mark.xfail(
+#     sys.version_info.minor <= 9,
+#     reason="upstream Pydra issue with type-checking 'type' objects",
+# )
 def test_png_to_bitmap(png):
     Bitmap.convert(png)

fileformats/generic/tests/test_file.py

@@ -1,6 +1,6 @@
 import pytest
 from fileformats.generic import FsObject, File
-from fileformats.testing import Magic, Foo, MyFormatX
+from fileformats.testing import Magic, MagicVersion, Foo, MyFormatX
 
 
 def test_sample_fsobject():
@@ -27,4 +27,4 @@ def test_sample_magic():
     reason="generate_sample_data for WithMagicVersion file types is not implemented yet"
 )
 def test_sample_magic_version():
-    assert isinstance(Magic.sample(), Magic)
+    assert isinstance(MagicVersion.sample(), MagicVersion)