[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/18] tests/acceptance: Extract tesseract_available() helper in n
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 01/18] tests/acceptance: Extract tesseract_available() helper in new namespace |
Date: |
Mon, 8 Feb 2021 14:36:54 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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>
---
tests/acceptance/machine_m68k_nextcube.py | 25 +++-----------------
tests/acceptance/tesseract_utils.py | 28 +++++++++++++++++++++++
2 files changed, 31 insertions(+), 22 deletions(-)
create mode 100644 tests/acceptance/tesseract_utils.py
diff --git a/tests/acceptance/machine_m68k_nextcube.py
b/tests/acceptance/machine_m68k_nextcube.py
index 2baba5fdc26..3c7400c43e4 100644
--- a/tests/acceptance/machine_m68k_nextcube.py
+++ b/tests/acceptance/machine_m68k_nextcube.py
@@ -1,19 +1,19 @@
# 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
# later. See the COPYING file in the top-level directory.
import os
-import re
import time
import logging
from avocado_qemu import Test
from avocado import skipUnless
from avocado.utils import process
-from avocado.utils.path import find_command, CmdNotFoundError
+
+from tesseract_utils import tesseract_available
PIL_AVAILABLE = True
try:
@@ -22,25 +22,6 @@
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):
"""
:avocado: tags=arch:m68k
diff --git a/tests/acceptance/tesseract_utils.py
b/tests/acceptance/tesseract_utils.py
new file mode 100644
index 00000000000..acd6e8c2faa
--- /dev/null
+++ b/tests/acceptance/tesseract_utils.py
@@ -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
--
2.26.2
- [PULL 00/18] Integration testing patches for 2021-02-08, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 02/18] tests/acceptance: Introduce tesseract_ocr() helper, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 01/18] tests/acceptance: Extract tesseract_available() helper in new namespace,
Philippe Mathieu-Daudé <=
- [PULL 03/18] tests/acceptance: Extract do_test_arm_orangepi_armbian_uboot() method, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 07/18] tests/acceptance: Add a test for the virtex-ml507 ppc machine, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 05/18] tests/acceptance: Move the pseries test to a separate file, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 06/18] tests/acceptance: Test the mpc8544ds machine, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 11/18] tests/acceptance/boot_linux: rename misleading cloudinit method, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 12/18] tests/acceptance/virtiofs_submounts: use workdir property, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 14/18] tests/acceptance/virtiofs_submounts: use a virtio-net device instead, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 15/18] tests/acceptance/virtiofs_submounts: standardize port as integer, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 04/18] tests/acceptance: Test U-Boot/Linux from Armbian 20.08 on Orange Pi PC, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 09/18] tests/acceptance: Re-enable the microblaze test, Philippe Mathieu-Daudé, 2021/02/08