tests/acceptance: Extract tesseract_available() helper in new namespace

We are going to reuse tesseract_available(). Extract it to
a new 'tesseract_utils' namespace.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201021105035.2477784-4-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-10-21 12:33:25 +02:00 committed by Philippe Mathieu-Daudé
parent 5b19cb63d9
commit 162127f29f
2 changed files with 31 additions and 22 deletions

View File

@ -1,19 +1,19 @@
# Functional test that boots a VM and run OCR on the framebuffer # Functional test that boots a VM and run OCR on the framebuffer
# #
# Copyright (c) Philippe Mathieu-Daudé <f4bug@amsat.org> # Copyright (c) 2019 Philippe Mathieu-Daudé <f4bug@amsat.org>
# #
# This work is licensed under the terms of the GNU GPL, version 2 or # This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
import os import os
import re
import time import time
import logging import logging
from avocado_qemu import Test from avocado_qemu import Test
from avocado import skipUnless from avocado import skipUnless
from avocado.utils import process from avocado.utils import process
from avocado.utils.path import find_command, CmdNotFoundError
from tesseract_utils import tesseract_available
PIL_AVAILABLE = True PIL_AVAILABLE = True
try: try:
@ -22,25 +22,6 @@
PIL_AVAILABLE = False PIL_AVAILABLE = False
def tesseract_available(expected_version):
try:
find_command('tesseract')
except CmdNotFoundError:
return False
res = process.run('tesseract --version')
try:
version = res.stdout_text.split()[1]
except IndexError:
version = res.stderr_text.split()[1]
return int(version.split('.')[0]) == expected_version
match = re.match(r'tesseract\s(\d)', res)
if match is None:
return False
# now this is guaranteed to be a digit
return int(match.groups()[0]) == expected_version
class NextCubeMachine(Test): class NextCubeMachine(Test):
""" """
:avocado: tags=arch:m68k :avocado: tags=arch:m68k

View File

@ -0,0 +1,28 @@
# ...
#
# Copyright (c) 2019 Philippe Mathieu-Daudé <f4bug@amsat.org>
#
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
import re
from avocado.utils.path import find_command, CmdNotFoundError
def tesseract_available(expected_version):
try:
find_command('tesseract')
except CmdNotFoundError:
return False
res = process.run('tesseract --version')
try:
version = res.stdout_text.split()[1]
except IndexError:
version = res.stderr_text.split()[1]
return int(version.split('.')[0]) == expected_version
match = re.match(r'tesseract\s(\d)', res)
if match is None:
return False
# now this is guaranteed to be a digit
return int(match.groups()[0]) == expected_version