Skip more tests which are expected to fail if vl-convert is not insta…

…lled
binste · May 18, 2024 · 7338bed · 7338bed
1 parent 035d225
commit 7338bed
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/tests/utils/test_compiler.py b/tests/utils/test_compiler.py
@@ -2,6 +2,11 @@
 import pytest
 from altair import vegalite_compilers, Chart
 
+try:
+    import vl_convert as vlc  # noqa: F401
+except ImportError:
+    vlc = None
+
 
 @pytest.fixture
 def chart():
@@ -24,17 +29,26 @@ def assert_is_vega_spec(vega_spec):
 
 
 def test_vegalite_compiler(chart):
+    if vlc is None:
+        pytest.skip("vl_convert is not installed")
+
     vegalite_spec = chart.to_dict()
     vega_spec = vegalite_compilers.get()(vegalite_spec)
     assert_is_vega_spec(vega_spec)
 
 
 def test_to_dict_with_format_vega(chart):
+    if vlc is None:
+        pytest.skip("vl_convert is not installed")
+
     vega_spec = chart.to_dict(format="vega")
     assert_is_vega_spec(vega_spec)
 
 
 def test_to_json_with_format_vega(chart):
+    if vlc is None:
+        pytest.skip("vl_convert is not installed")
+
     json_spec = chart.to_json(format="vega")
     assert isinstance(json_spec, str)
     spec = json.loads(json_spec)

diff --git a/tests/utils/test_mimebundle.py b/tests/utils/test_mimebundle.py
@@ -168,9 +168,8 @@ def vega_spec():
     }
 
 
-@pytest.mark.parametrize("engine", ["vl-convert", None])
-def test_vegalite_to_vega_mimebundle(engine, vegalite_spec, vega_spec):
-    if engine == "vl-convert" and vlc is None:
+def test_vegalite_to_vega_mimebundle(vegalite_spec, vega_spec):
+    if vlc is None:
         pytest.skip("vl_convert not importable; cannot run mimebundle tests")
 
     bundle = spec_to_mimebundle(
@@ -180,7 +179,7 @@ def test_vegalite_to_vega_mimebundle(engine, vegalite_spec, vega_spec):
         vega_version=alt.VEGA_VERSION,
         vegalite_version=alt.VEGALITE_VERSION,
         vegaembed_version=alt.VEGAEMBED_VERSION,
-        engine=engine,
+        engine="vl-convert",
     )
 
     assert bundle == {"application/vnd.vega.v5+json": vega_spec}

diff --git a/tests/vegalite/v5/test_api.py b/tests/vegalite/v5/test_api.py
@@ -357,6 +357,9 @@ def test_save_html(basic_chart, inline):
 
 
 def test_to_url(basic_chart):
+    if vlc is None:
+        pytest.skip("vl_convert is not installed")
+
     share_url = basic_chart.to_url()
     expected_vegalite_encoding = "N4Igxg9gdgZglgcxALlANzgUwO4tJKAFzigFcJSBnAdTgBNCALFAZgAY2AacaYsiygAlMiRoVYcAvpO50AhoTl4QUOQFtMKEPMUBaAOwA2ABwAWFi1NyTcgEb7TtuabAswc-XTZhMczLdNDAEYQGRA1OQAnAGtlQgBPAAdNZBAnSNDuTChIOhIkVBAAD2V4TAAbOi0lbgTkrSgINRI5csyQeNKsSq1bEFqklJAAR1I5IjhFYjRNaW4AEkowRkwIrTFCRMpkAHodmYQ5ADoEScZSWyO4CB2llYj9zEPdcsnMfYBWI6D9I7YjgBWlGg-W0CjklEwhEoyh0cgMJnMlmsxjsDicLjcHi8Pj8AWCKAA2qAlKkAIKgvrIABMxhkJK0ACFKSgPh96SBSSAAMIs5DmDlcgAifIAnEFBVoAKJ84wSzgM1IAMT5HxYktSAHE+UFRRqQIJZfp9QBJVXUyQAXWkQA"