From d2589d4ca33e44d2779fedbf3e85ff31d58057e9 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 21 Aug 2025 14:49:03 +0800 Subject: [PATCH] Update CI tests --- .fmf/version | 1 + opencc.spec | 6 ++- plans/basic.fmf | 5 ++ tests/main.fmf | 5 ++ .../opencc-testing-role/defaults/main.yml | 2 - tests/roles/opencc-testing-role/meta/main.yml | 4 -- .../roles/opencc-testing-role/tasks/main.yml | 47 ------------------- tests/runtest.sh | 25 ++++++++++ tests/tests.yml | 10 ---- 9 files changed, 41 insertions(+), 64 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/main.fmf delete mode 100644 tests/roles/opencc-testing-role/defaults/main.yml delete mode 100644 tests/roles/opencc-testing-role/meta/main.yml delete mode 100644 tests/roles/opencc-testing-role/tasks/main.yml create mode 100755 tests/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/opencc.spec b/opencc.spec index fb20e01..5b031c6 100644 --- a/opencc.spec +++ b/opencc.spec @@ -1,6 +1,6 @@ Name: opencc Version: 1.1.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Libraries for Simplified-Traditional Chinese Conversion License: Apache-2.0 URL: https://github.com/BYVoid/OpenCC @@ -82,6 +82,10 @@ developing applications that use %{name}. %{_libdir}/cmake/opencc/OpenCC*.cmake %changelog +* Thu Aug 21 2025 Peng Wu - 1.1.9-5 +- Update CI tests +- Resolves: RHBZ#2382996 + * Tue Aug 12 2025 Peng Wu - 1.1.9-4 - Update for https://fedoraproject.org/wiki/Changes/CMake_drop_install_vars - Resolves: RHBZ#2381327 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..e1bf8b4 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,5 @@ +test: ./runtest.sh +duration: 50m +framework: beakerlib +require: + - opencc-tools diff --git a/tests/roles/opencc-testing-role/defaults/main.yml b/tests/roles/opencc-testing-role/defaults/main.yml deleted file mode 100644 index af4befe..0000000 --- a/tests/roles/opencc-testing-role/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -role_pkgs_req: - - rsync diff --git a/tests/roles/opencc-testing-role/meta/main.yml b/tests/roles/opencc-testing-role/meta/main.yml deleted file mode 100644 index 6626402..0000000 --- a/tests/roles/opencc-testing-role/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -dependencies: - - role: str-common-init diff --git a/tests/roles/opencc-testing-role/tasks/main.yml b/tests/roles/opencc-testing-role/tasks/main.yml deleted file mode 100644 index 05195e7..0000000 --- a/tests/roles/opencc-testing-role/tasks/main.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- name: Check if opencc is installed - register: opencc_testing_runner - find: - paths: "{{ ansible_env.PATH.split(':') }}" - pattern: opencc - -- name: Install opencc-tools - when: opencc_testing_runner.matched == 0 - block: - - name: Installing opencc-tools - package: - name: - - opencc-tools - -- name: Start opencc tests - block: - - name: Execute tests - shell: | - set -e - log_file="{{ remote_artifacts }}/{{ installed_test_name }}.log" - exec 2>>$log_file 1>>$log_file - echo "Starting opencc tests" - TEST=opencc - status="FAIL" - opencc >> "{{ remote_artifacts }}/test.log" <> {{ remote_artifacts }}/test.log - - - name: Check the results - shell: grep "^FAIL" {{ remote_artifacts }}/test.log - register: test_fails - failed_when: False - - - name: Set role result - set_fact: - role_result_failed: "{{ (test_fails.stdout|d|length > 0) or (test_fails.stderr|d|length > 0) }}" - role_result_msg: "{{ test_fails.stdout|d('tests failed.') }}" - - - include_role: - name: str-common-final - diff --git a/tests/runtest.sh b/tests/runtest.sh new file mode 100755 index 0000000..87b6793 --- /dev/null +++ b/tests/runtest.sh @@ -0,0 +1,25 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlShowPackageVersion opencc + rlRun -t -l "VERSION=$(rpm -q opencc --queryformat='%{version}')" 0 "Get VERSION" + FEDORA_VERSION=$(rlGetDistroRelease) + rlLog "FEDORA_VERSION=${DISTRO_RELEASE}" + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlPhaseEnd + + rlPhaseStartTest + rlRun "set -o pipefail" + rlRun "echo '测试'>input.txt" 0 "Generate input.txt" + rlRun "opencc -i input.txt -o output.txt" 0 "Run opencc tool" + rlRun "grep '測試' output.txt" 0 "Check output.txt" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index aa45e49..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: localhost - roles: - - role: opencc-testing-role - installed_test_name: opencc - tags: - - classic - - gating - required_packages: - - opencc-tools -