From: Vladimír Vondruš <mosra@centrum.cz>
Date: Tue, 12 May 2020 07:38:39 +0000 (+0200)
Subject: documentation/python: parametrize tests with search data version.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=830352f3eacf740ca9569cbd6e9fa18d7958991d;p=blog.git

documentation/python: parametrize tests with search data version.
---

diff --git a/documentation/test_python/test_layout.py b/documentation/test_python/test_layout.py
index 06f376c3..06fd32a2 100644
--- a/documentation/test_python/test_layout.py
+++ b/documentation/test_python/test_layout.py
@@ -24,7 +24,7 @@
 
 import os
 
-from _search import searchdata_filename, searchdata_filename_b85
+from _search import searchdata_format_version, searchdata_filename, searchdata_filename_b85
 from . import BaseTestCase
 
 class Layout(BaseTestCase):
@@ -59,7 +59,7 @@ class Layout(BaseTestCase):
         self.assertEqual(*self.actual_expected_contents('index.html'))
         self.assertTrue(os.path.exists(os.path.join(self.path, 'output/m-dark+documentation.compiled.css')))
         self.assertTrue(os.path.exists(os.path.join(self.path, 'output/favicon-light.png')))
-        self.assertTrue(os.path.exists(os.path.join(self.path, 'output/search-v1.js')))
+        self.assertTrue(os.path.exists(os.path.join(self.path, 'output/search-v{}.js'.format(searchdata_format_version))))
         self.assertTrue(os.path.exists(os.path.join(self.path, 'output', searchdata_filename_b85)))
         self.assertTrue(os.path.exists(os.path.join(self.path, 'output/sitemap.xml')))
 
@@ -70,7 +70,7 @@ class SearchBinary(BaseTestCase):
             'SEARCH_DOWNLOAD_BINARY': True
         })
         self.assertEqual(*self.actual_expected_contents('index.html'))
-        self.assertTrue(os.path.exists(os.path.join(self.path, 'output', 'search-v1.js')))
+        self.assertTrue(os.path.exists(os.path.join(self.path, 'output', 'search-v{}.js'.format(searchdata_format_version))))
         self.assertTrue(os.path.exists(os.path.join(self.path, 'output', searchdata_filename)))
 
 class SearchOpenSearch(BaseTestCase):
@@ -82,7 +82,7 @@ class SearchOpenSearch(BaseTestCase):
             'SEARCH_HELP': "Right-click to add a search engine."
         })
         self.assertEqual(*self.actual_expected_contents('index.html'))
-        self.assertTrue(os.path.exists(os.path.join(self.path, 'output', 'search-v1.js')))
+        self.assertTrue(os.path.exists(os.path.join(self.path, 'output', 'search-v{}.js'.format(searchdata_format_version))))
         self.assertEqual(*self.actual_expected_contents('opensearch.xml'))
 
 class ProjectLogo(BaseTestCase):
diff --git a/documentation/test_python/test_link_formatting.py b/documentation/test_python/test_link_formatting.py
index 3f92d5cb..9a3f7694 100644
--- a/documentation/test_python/test_link_formatting.py
+++ b/documentation/test_python/test_link_formatting.py
@@ -48,7 +48,7 @@ def custom_url_formatter(type: EntryType, path: List[str]) -> str:
             url = 'search-v{}.js'.format(searchdata_format_version)
         # Everything except the search data (which don't exist yet) should be
         # absolute
-        if url != 'absolutesearchdata-v1.bin':
+        if url != 'absolutesearchdata-v{}.bin'.format(searchdata_format_version):
             assert os.path.isabs(path[0]) and os.path.exists(path[0]), path[0]
         filename = 't.' + url
     else: assert False
@@ -114,6 +114,6 @@ class LinkFormatting(BaseInspectTestCase):
         # Static data
         self.assertTrue(os.path.exists(os.path.join(self.path, 'output/t.favicon-light.png')))
         self.assertTrue(os.path.exists(os.path.join(self.path, 'output/t.m-dark+documentation.compiled.css')))
-        self.assertTrue(os.path.exists(os.path.join(self.path, 'output/t.search-v1.js')))
-        self.assertTrue(os.path.exists(os.path.join(self.path, 'output/t.absolutesearchdata-v1.bin')))
+        self.assertTrue(os.path.exists(os.path.join(self.path, 'output/t.search-v{}.js'.format(searchdata_format_version))))
+        self.assertTrue(os.path.exists(os.path.join(self.path, 'output/t.absolutesearchdata-v{}.bin'.format(searchdata_format_version))))
         self.assertTrue(os.path.exists(os.path.join(self.path, 'output/t.tiny.png')))