From: Vladimír Vondruš Date: Mon, 26 Nov 2018 14:36:52 +0000 (+0100) Subject: Remove test files for dot 2.36, not needed anymore. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=6049af84005166a310825423dd2cefc159b80ced;p=blog.git Remove test files for dot 2.36, not needed anymore. --- diff --git a/doxygen/test/contents_dot/index-236.html b/doxygen/test/contents_dot/index-236.html deleted file mode 100644 index 7af67227..00000000 --- a/doxygen/test/contents_dot/index-236.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - - My Project - - - - - -
-
-
-
-
-

- My Project -

-

Note: the test uses DejaVu Sans instead of Source Sans Pro in order to have predictable rendering on the CIs.

- -Basics - -a - -a - - -b - - -b - - -a->b - - - - -c - -c - - -b->c - - -0 - - -c->c - - -1 - - - -
- -Colors - -a - -a - - -b - -b - - -a->b - - -yes - - -b->b - - -no - - - -
- - -a - -a - - -b - -b - - -a--b - - - - -
A graph
- - -a - -a - - -b - -b - - -a--b - - - - -
A graph
-
-
-
-
- - diff --git a/doxygen/test/contents_dot/index-238.html b/doxygen/test/contents_dot/index-238.html index 3e7bcdf7..67986298 100644 --- a/doxygen/test/contents_dot/index-238.html +++ b/doxygen/test/contents_dot/index-238.html @@ -87,8 +87,7 @@ - -
+
a diff --git a/doxygen/test/test_contents.py b/doxygen/test/test_contents.py index e8708799..5c808144 100644 --- a/doxygen/test/test_contents.py +++ b/doxygen/test/test_contents.py @@ -362,19 +362,12 @@ class Dot(IntegrationTestCase): self.run_dox2html5(wildcard='indexpage.xml') self.assertEqual(*self.actual_expected_contents('index.html')) - @unittest.skipUnless(LooseVersion(dot_version()) < LooseVersion("2.40.1") and - LooseVersion(dot_version()) >= LooseVersion("2.38.0"), - "Dot < 2.38 and dot > 2.38 has a completely different output.") + @unittest.skipUnless(LooseVersion(dot_version()) < LooseVersion("2.40.1"), + "Dot < 2.40.1 has a completely different output.") def test_238(self): self.run_dox2html5(wildcard='indexpage.xml') self.assertEqual(*self.actual_expected_contents('index.html', 'index-238.html')) - @unittest.skipUnless(LooseVersion(dot_version()) < LooseVersion("2.38.0"), - "Dot > 2.36 has a completely different output.") - def test_236(self): - self.run_dox2html5(wildcard='indexpage.xml') - self.assertEqual(*self.actual_expected_contents('index.html', 'index-236.html')) - def test_warnings(self): self.run_dox2html5(wildcard='warnings.xml') self.assertEqual(*self.actual_expected_contents('warnings.html')) diff --git a/pelican-plugins/m/test/dot/page-236.html b/pelican-plugins/m/test/dot/page-236.html deleted file mode 100644 index cc067475..00000000 --- a/pelican-plugins/m/test/dot/page-236.html +++ /dev/null @@ -1,278 +0,0 @@ - - -
 - - m.dot | A Pelican Blog - - - - - - -
-
-
-
-
-
-

m.dot

- -

Note: the test uses DejaVu Sans instead of Source Sans Pro in order to have -predictable rendering on the CIs.

-

Different shapes, fills etc. All default colors, filled only the first node -and the arrowheads, nothing else. Non-default font size should be preserved.

-
- - -Basics - -a - -a - - -b - - -b - - -a->b - - - - -c - -c - - -b->c - - -0 - - -c->c - - -1 - - - -
-

Colors:

-
- - -Colors - -a - -a - - -b - -b - - -a->b - - -yes - - -b->b - - -no - - - -
-

Unoriented graph without a title:

-
- - - -a - -a - - -b - -b - - -a--b - - - -a--b - - - - -
-

Strict graphs:

-
- - -A to B - -a - -a - - -b - -b - - -a->b - - - - - -
-
- - -A to B - -a - -a - - -b - -b - - -a--b - - - - -
-

Structs:

-
- - -Structs - -struct - -a - -b - -c - -d - -e - - -another - -a - -b - -c - -d - -e - - - -
-
- - -A to B - -a - -a - - -b - -b - - -a->b - - - - - -
This is a title.
-

This is a description.

-
-
- - - -a - -a - - -b - -b - - -a->b - - - - - -

The graph below should not be styled as a part of the figure:

-
- - -A to B - -a - -a - - -b - -b - - -a->b - - - - - -
-
- -
-
-
-
-
- - diff --git a/pelican-plugins/m/test/test_dot.py b/pelican-plugins/m/test/test_dot.py index 13e8a89a..5ba3644a 100644 --- a/pelican-plugins/m/test/test_dot.py +++ b/pelican-plugins/m/test/test_dot.py @@ -50,9 +50,8 @@ class Dot(PluginTestCase): self.assertEqual(*self.actual_expected_contents('page.html')) @unittest.skipUnless(LooseVersion(sys.version) >= LooseVersion("3.5") and - LooseVersion(dot_version()) < LooseVersion("2.40.1") and - LooseVersion(dot_version()) >= LooseVersion("2.38.0"), - "The math plugin requires at least Python 3.5 installed. Dot < 2.38 and dot > 2.38 has a completely different output.") + LooseVersion(dot_version()) < LooseVersion("2.40.1"), + "The math plugin requires at least Python 3.5 installed. Dot < 2.40.1 has a completely different output.") def test_238(self): self.run_pelican({ 'PLUGINS': ['m.htmlsanity', 'm.components', 'm.dot'], @@ -60,14 +59,3 @@ class Dot(PluginTestCase): }) self.assertEqual(*self.actual_expected_contents('page.html', 'page-238.html')) - - @unittest.skipUnless(LooseVersion(sys.version) >= LooseVersion("3.5") and - LooseVersion(dot_version()) < LooseVersion("2.38.0"), - "The math plugin requires at least Python 3.5 installed. Dot > 2.36 has a completely different output.") - def test_236(self): - self.run_pelican({ - 'PLUGINS': ['m.htmlsanity', 'm.components', 'm.dot'], - 'M_DOT_FONT': 'DejaVu Sans' - }) - - self.assertEqual(*self.actual_expected_contents('page.html', 'page-236.html'))