From: Vladimír Vondruš Date: Sun, 9 Jan 2022 21:43:13 +0000 (+0100) Subject: documentation/doxygen: adapt test output for silly 1.8.18 differences. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=4ec09a2c97f60c2c673de337d7dabdc198592f4a;p=blog.git documentation/doxygen: adapt test output for silly 1.8.18 differences. Is this a random order? FFS. --- diff --git a/documentation/test_doxygen/contents_blocks/old.html b/documentation/test_doxygen/contents_blocks/old.html index 13f01f80..acb3c1c0 100644 --- a/documentation/test_doxygen/contents_blocks/old.html +++ b/documentation/test_doxygen/contents_blocks/old.html @@ -22,7 +22,7 @@

Just old

-
Member foo ()

Xrefitem, gets merged

with this one by Doxygen itself.

page Main Page

This is old.

This is not merged.

With this. Only on the listing page.

+
page Main Page

This is old.

This is not merged.

With this. Only on the listing page.

Member foo ()

Xrefitem, gets merged

with this one by Doxygen itself.

diff --git a/documentation/test_doxygen/contents_blocks/old_1817.html b/documentation/test_doxygen/contents_blocks/old_1817.html new file mode 100644 index 00000000..13f01f80 --- /dev/null +++ b/documentation/test_doxygen/contents_blocks/old_1817.html @@ -0,0 +1,31 @@ + + + + + Just old | My Project + + + + + +
+
+
+
+
+

+ Just old +

+
Member foo ()

Xrefitem, gets merged

with this one by Doxygen itself.

page Main Page

This is old.

This is not merged.

With this. Only on the listing page.

+
+
+
+
+ + diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py index b32a65c6..cb5e31e7 100644 --- a/documentation/test_doxygen/test_contents.py +++ b/documentation/test_doxygen/test_contents.py @@ -61,19 +61,22 @@ class Blocks(IntegrationTestCase): self.run_doxygen(wildcard='*.xml') self.assertEqual(*self.actual_expected_contents('doxygen1818.html')) - @unittest.skipUnless(LooseVersion(doxygen_version()) > LooseVersion("1.8.14"), - "https://github.com/doxygen/doxygen/pull/6587 fucking broke this") - def test_xrefitem1814(self): - self.run_doxygen(wildcard='*.xml') - self.assertEqual(*self.actual_expected_contents('todo.html')) - self.assertEqual(*self.actual_expected_contents('old.html')) - - @unittest.skipUnless(LooseVersion(doxygen_version()) <= LooseVersion("1.8.14"), - "https://github.com/doxygen/doxygen/pull/6587 fucking broke this") def test_xrefitem(self): self.run_doxygen(wildcard='*.xml') - self.assertEqual(*self.actual_expected_contents('todo.html', 'todo_1814.html')) - self.assertEqual(*self.actual_expected_contents('old.html', 'old_1814.html')) + + if LooseVersion(doxygen_version()) > LooseVersion("1.8.14"): + self.assertEqual(*self.actual_expected_contents('todo.html')) + # https://github.com/doxygen/doxygen/pull/6587 fucking broke this + else: + self.assertEqual(*self.actual_expected_contents('todo.html', 'todo_1814.html')) + + # 1.8.18 has a different order, not sure why + if LooseVersion(doxygen_version()) >= LooseVersion("1.8.18"): + self.assertEqual(*self.actual_expected_contents('old.html')) + elif LooseVersion(doxygen_version()) > LooseVersion("1.8.14"): + self.assertEqual(*self.actual_expected_contents('old.html', 'old_1817.html')) + else: + self.assertEqual(*self.actual_expected_contents('old.html', 'old_1814.html')) class Internal(IntegrationTestCase): def test(self):