From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sun, 2 Jan 2022 19:16:50 +0000 (+0100)
Subject: m.dot, documentation/*: use graphviz 2.44 output for 2.42.2 also.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=76c46d81548d108cea3b2c481f4eb3c547ef956a;p=blog.git

m.dot, documentation/*: use graphviz 2.44 output for 2.42.2 also.

Hope this finally makes the CI pass.
---

diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py
index df658017..2ead912b 100644
--- a/documentation/test_doxygen/test_contents.py
+++ b/documentation/test_doxygen/test_contents.py
@@ -255,7 +255,8 @@ class Custom(IntegrationTestCase):
     def test_dot(self):
         self.run_doxygen(wildcard='dot.xml')
 
-        if LooseVersion(dot_version()) >= LooseVersion("2.44.0"):
+        # Used to be >= 2.44.0, but 2.42.2 appears to have the same output
+        if LooseVersion(dot_version()) >= LooseVersion("2.42.2"):
             file = 'dot.html'
         elif LooseVersion(dot_version()) > LooseVersion("2.40.0"):
             file = 'dot-240.html'
@@ -338,7 +339,8 @@ class Dot(IntegrationTestCase):
     def test(self):
         self.run_doxygen(wildcard='indexpage.xml')
 
-        if LooseVersion(dot_version()) >= LooseVersion("2.44.0"):
+        # Used to be >= 2.44.0, but 2.42.2 appears to have the same output
+        if LooseVersion(dot_version()) >= LooseVersion("2.42.2"):
             file = 'index.html'
         elif LooseVersion(dot_version()) > LooseVersion("2.40.0"):
             file = 'index-240.html'
diff --git a/documentation/test_python/test_page.py b/documentation/test_python/test_page.py
index 0d412dbb..42e432de 100644
--- a/documentation/test_python/test_page.py
+++ b/documentation/test_python/test_page.py
@@ -82,8 +82,8 @@ class Plugins(BaseTestCase):
         })
         self.assertEqual(*self.actual_expected_contents('index.html'))
 
-        # The output is different for every other Graphviz
-        if LooseVersion(dot_version()) >= LooseVersion("2.44.0"):
+        # Used to be >= 2.44.0, but 2.42.2 appears to have the same output
+        if LooseVersion(dot_version()) >= LooseVersion("2.42.2"):
             file = 'dot.html'
         elif LooseVersion(dot_version()) > LooseVersion("2.40.0"):
             file = 'dot-240.html'
diff --git a/plugins/m/test/test_dot.py b/plugins/m/test/test_dot.py
index fd366706..0d227c16 100644
--- a/plugins/m/test/test_dot.py
+++ b/plugins/m/test/test_dot.py
@@ -43,7 +43,8 @@ class Dot(PelicanPluginTestCase):
             'M_DOT_FONT': 'DejaVu Sans'
         })
 
-        if LooseVersion(dot_version()) >= LooseVersion("2.44.0"):
+        # Used to be >= 2.44.0, but 2.42.2 appears to have the same output
+        if LooseVersion(dot_version()) >= LooseVersion("2.42.2"):
             file = 'page.html'
         elif LooseVersion(dot_version()) > LooseVersion("2.40.0"):
             file = 'page-240.html'