From 539469e11f5da31fb6d4eeba31ccf62470f2e5b2 Mon Sep 17 00:00:00 2001
From: Benoit Bovy <benbovy@gmail.com>
Date: Wed, 29 Aug 2018 18:13:17 +0200
Subject: [PATCH 1/2] allow jpeg format to xfail in test_dot

---
 xsimlab/tests/test_dot.py | 94 ++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 46 deletions(-)

diff --git a/xsimlab/tests/test_dot.py b/xsimlab/tests/test_dot.py
index d8c19f1e..4c4045ce 100644
--- a/xsimlab/tests/test_dot.py
+++ b/xsimlab/tests/test_dot.py
@@ -4,6 +4,11 @@
 
 import pytest
 pytest.importorskip("graphviz")
+try:
+    from IPython.display import Image, SVG
+    ipython_installed = True
+except ImportError:
+    ipython_installed = False
 
 from xsimlab.dot import to_graphviz, dot_graph, _hash_variable
 from xsimlab.utils import variables_dict
@@ -83,32 +88,31 @@ def test_to_graphviz_attributes(model):
     assert to_graphviz(model, rankdir='BT').graph_attr['rankdir'] == 'BT'
 
 
-def test_dot_graph(model, tmpdir):
-    ipydisp = pytest.importorskip('IPython.display')
-
+@pytest.mark.skipif(ipython_installed == False,
+                    reason="IPython is not installed")
+@pytest.mark.parametrize('format,typ', [
+    ('png', Image),
+    pytest.mark.xfail(('jpeg', Image),
+                      reason='jpeg not always supported in dot'),
+    ('dot', type(None)),
+    ('pdf', type(None)),
+    ('svg', SVG),
+])
+def test_dot_graph(model, tmpdir, format, typ):
     # Use a name that the shell would interpret specially to ensure that we're
     # not vulnerable to shell injection when interacting with `dot`.
     filename = str(tmpdir.join('$(touch should_not_get_created.txt)'))
 
-    # Map from format extension to expected return type.
-    result_types = {
-        'png': ipydisp.Image,
-        'jpeg': ipydisp.Image,
-        'dot': type(None),
-        'pdf': type(None),
-        'svg': ipydisp.SVG,
-    }
-    for format in result_types:
-        target = '.'.join([filename, format])
-        _ensure_not_exists(target)
-        try:
-            result = dot_graph(model, filename=filename, format=format)
+    target = '.'.join([filename, format])
+    _ensure_not_exists(target)
+    try:
+        result = dot_graph(model, filename=filename, format=format)
 
-            assert not os.path.exists('should_not_get_created.txt')
-            assert os.path.isfile(target)
-            assert isinstance(result, result_types[format])
-        finally:
-            _ensure_not_exists(target)
+        assert not os.path.exists('should_not_get_created.txt')
+        assert os.path.isfile(target)
+        assert isinstance(result, typ)
+    finally:
+        _ensure_not_exists(target)
 
     # format supported by graphviz but not by IPython
     with pytest.raises(ValueError) as excinfo:
@@ -124,28 +128,28 @@ def test_dot_graph_no_ipython(model):
         assert result is None
 
 
-def test_dot_graph_no_filename(tmpdir, model):
-    ipydisp = pytest.importorskip('IPython.display')
-
-    # Map from format extension to expected return type.
-    result_types = {
-        'png': ipydisp.Image,
-        'jpeg': ipydisp.Image,
-        'dot': type(None),
-        'pdf': type(None),
-        'svg': ipydisp.SVG,
-    }
-    for format in result_types:
-        before = tmpdir.listdir()
-        result = dot_graph(model, filename=None, format=format)
-        # We shouldn't write any files if filename is None.
-        after = tmpdir.listdir()
-        assert before == after
-        assert isinstance(result, result_types[format])
-
-
+@pytest.mark.skipif(ipython_installed == False,
+                    reason="IPython is not installed")
+@pytest.mark.parametrize('format,typ', [
+    ('png', Image),
+    pytest.mark.xfail(('jpeg', Image),
+                      reason='jpeg not always supported in dot'),
+    ('dot', type(None)),
+    ('pdf', type(None)),
+    ('svg', SVG),
+])
+def test_dot_graph_no_filename(tmpdir, model, format, typ):
+    before = tmpdir.listdir()
+    result = dot_graph(model, filename=None, format=format)
+    # We shouldn't write any files if filename is None.
+    after = tmpdir.listdir()
+    assert before == after
+    assert isinstance(result, typ)
+
+
+@pytest.mark.skipif(ipython_installed == False,
+                    reason="IPython is not installed")
 def test_filenames_and_formats(model):
-    ipydisp = pytest.importorskip('IPython.display')
 
     # Test with a variety of user provided args
     filenames = ['modelpdf', 'model.pdf', 'model.pdf', 'modelpdf',
@@ -155,11 +159,9 @@ def test_filenames_and_formats(model):
                'model.pdf.svg']
 
     result_types = {
-        'png': ipydisp.Image,
-        'jpeg': ipydisp.Image,
-        'dot': type(None),
+        'png': Image,
         'pdf': type(None),
-        'svg': ipydisp.SVG,
+        'svg': SVG,
     }
 
     for filename, format, target in zip(filenames, formats, targets):

From b36ff4d313599679e418e533bc7c0aa8d8ac92d6 Mon Sep 17 00:00:00 2001
From: Benoit Bovy <benbovy@gmail.com>
Date: Wed, 29 Aug 2018 18:24:24 +0200
Subject: [PATCH 2/2] fix NameError

---
 xsimlab/tests/test_dot.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xsimlab/tests/test_dot.py b/xsimlab/tests/test_dot.py
index 4c4045ce..3ee98bbf 100644
--- a/xsimlab/tests/test_dot.py
+++ b/xsimlab/tests/test_dot.py
@@ -8,6 +8,8 @@
     from IPython.display import Image, SVG
     ipython_installed = True
 except ImportError:
+    Image = None,
+    SVG = None
     ipython_installed = False
 
 from xsimlab.dot import to_graphviz, dot_graph, _hash_variable