test_bashlib: use version verbatim

OCR-D · Aug 14, 2024 · 93a742e · 93a742e
1 parent dd3046e
commit 93a742e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/repo/spec b/repo/spec
diff --git a/src/ocrd_utils/config.py b/src/ocrd_utils/config.py
@@ -125,7 +125,7 @@ def raw_value(self, name):
     description="If set, then the CPU profile is written to this file for later peruse with a analysis tools like snakeviz")
 
 config.add("OCRD_DOWNLOAD_RETRIES",
-    description="Number of times to retry failed attempts for downloads of workspace files.",
+    description="Number of times to retry failed attempts for downloads of resource or workspace files.",
     validator=int,
     parser=int)
 

diff --git a/tests/cli/test_bashlib.py b/tests/cli/test_bashlib.py
@@ -104,10 +104,8 @@ def test_bashlib_minversion(self):
         exit_code, out, err = self.invoke_bash(
             "source $(ocrd bashlib filename) && ocrd__minversion 2.29.0")
         assert exit_code == 0
-        (major, minor, patch) = map(int, str(VERSION).split('.'))
-        version = "%d.%d.%d" % (major, minor + 1, patch)
         exit_code, out, err = self.invoke_bash(
-            "source $(ocrd bashlib filename) && ocrd__minversion " + version)
+            "source $(ocrd bashlib filename) && ocrd__minversion " + VERSION)
         assert exit_code > 0
         assert "ERROR: ocrd/core is too old" in err
 

diff --git a/tests/validator/test_ocrd_tool_validator.py b/tests/validator/test_ocrd_tool_validator.py
@@ -29,7 +29,7 @@ def setUp(self):
 
     def test_smoke(self):
         report = OcrdToolValidator.validate(self.ocrd_tool)
-        self.assertTrue(report.is_valid, report)
+        self.assertTrue(report.is_valid, str(report.errors))
 
     def test_additional_props(self):
         self.ocrd_tool['not-allowed'] = 'YUP'
@@ -48,7 +48,7 @@ def test_file_param_ok(self):
         ocrd_tool = json.loads(skeleton)
         ocrd_tool['tools']['ocrd-xyz']['parameters'] = {"file-param": {"description": "...", "type": "string", "content-type": 'application/rdf+xml'}}
         report = OcrdToolValidator.validate(ocrd_tool)
-        self.assertTrue(report.is_valid, report)
+        self.assertTrue(report.is_valid, str(report.errors))
 
     # Not restricted anymore since spec 3.3.0
     #  def test_file_param_bad_content_types(self):
+2 −0		.gitignore
+39 −0		CHANGELOG.md
+8 −8		Makefile
+1 −1		README.md
+ −		assets/request-processing.jpg
+ −		assets/web-api-distributed-queue.jpg
+ −		assets/web-api-distributed.jpg
+1 −1		bagit-profile.json
+6 −1		cli.md
+167 −163		decisions.md
+1 −1		glossary.md
+2 −2		nextflow.md
+548 −0		ocrd_eval.md
+102 −0		ocrd_eval.sample.json
+1 −0		ocrd_eval.schema.json
+217 −0		ocrd_eval.schema.yml
+6 −5		ocrd_tool.md
+1 −1		ocrd_tool.schema.json
+38 −8		ocrd_tool.schema.yml
+306 −179		openapi.yml
+1 −1		page.md
+397 −0		web_api.md
+144 −0		web_api/config.schema.yml
+66 −0		web_api/processing-message.schema.yml
+31 −0		web_api/result-message.schema.yml