From 9dfc1e0d3da44a6008c22e941cc2f83b7a8b6783 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 14 Sep 2024 00:28:15 +0200 Subject: [PATCH] documentation/doxygen: properly adapt all tests to graphviz 10. Forgot this in 182939f4d403c42c061b6d37907fab2286b6da24. --- .../test_doxygen/contents_custom/dot-2.html | 67 +++++++++++++++++++ .../test_doxygen/contents_custom/dot.html | 28 ++++---- documentation/test_doxygen/test_contents.py | 8 ++- 3 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 documentation/test_doxygen/contents_custom/dot-2.html diff --git a/documentation/test_doxygen/contents_custom/dot-2.html b/documentation/test_doxygen/contents_custom/dot-2.html new file mode 100644 index 00000000..153e4ebf --- /dev/null +++ b/documentation/test_doxygen/contents_custom/dot-2.html @@ -0,0 +1,67 @@ + + + + + Dot | My Project + + + + + +
+
+
+
+
+

+ Dot +

+

A red graph:

+ + +a + +a + + +b + +b + + +a--b + + + + +

A blue graph, from a file:

+ + +a + +a + + +b + +b + + +a--b + + + + +
+
+
+
+
+ + diff --git a/documentation/test_doxygen/contents_custom/dot.html b/documentation/test_doxygen/contents_custom/dot.html index 153e4ebf..ba37aa94 100644 --- a/documentation/test_doxygen/contents_custom/dot.html +++ b/documentation/test_doxygen/contents_custom/dot.html @@ -22,39 +22,39 @@

Dot

-

A red graph:

- +

A red graph:

+ a - -a + +a b - -b + +b a--b - + -

A blue graph, from a file:

- +

A blue graph, from a file:

+ a - -a + +a b - -b + +b a--b - + diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py index 790a654a..cf9e7275 100644 --- a/documentation/test_doxygen/test_contents.py +++ b/documentation/test_doxygen/test_contents.py @@ -281,9 +281,13 @@ class Custom(IntegrationTestCase): def test_dot(self): self.run_doxygen(wildcard='dot.xml') - # Used to be >= 2.44.0, but 2.42.2 appears to have the same output - if parse_version(dot_version()) >= parse_version("2.42.2"): + # The damn thing adopted Chrome versioning apparently. No idea if the + # output changed in version 7, 8 or 9 already. + if parse_version(dot_version()) >= parse_version("10.0"): file = 'dot.html' + # Used to be >= 2.44.0, but 2.42.2 appears to have the same output + elif parse_version(dot_version()) >= parse_version("2.42.2"): + file = 'dot-2.html' else: file = 'dot-240.html' -- 2.30.2