From 93a742efffb31cf4890585c555bfd7e1e77c22bc Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Wed, 14 Aug 2024 13:41:42 +0200 Subject: [PATCH] test_bashlib: use version verbatim --- repo/spec | 2 +- src/ocrd_utils/config.py | 2 +- tests/cli/test_bashlib.py | 4 +--- tests/validator/test_ocrd_tool_validator.py | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/repo/spec b/repo/spec index 506b33936d..2bbd4dd916 160000 --- a/repo/spec +++ b/repo/spec @@ -1 +1 @@ -Subproject commit 506b33936d89080a683fa8a26837f2a23b23e5e2 +Subproject commit 2bbd4dd916519f567e5c648b24c0b5ca6fc8a183 diff --git a/src/ocrd_utils/config.py b/src/ocrd_utils/config.py index b3a3e9537d..d0955a8dcf 100644 --- 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 index 1807b1f47d..c4b2fd7da7 100644 --- 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 index 8612353890..2d035757ed 100644 --- 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):