From 209ced22f6fca6f6700861aa1c4164d464476432 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Wed, 27 Nov 2024 15:57:24 +0100 Subject: [PATCH] Run Windows installation tests Signed-off-by: Vitalii Koshura --- .github/workflows/windows.yml | 6 ++++ tests/include/testhelper.py | 34 +++++++++++++++++++ .../testset.py | 0 .../linux_package_tests/integration_tests.py | 23 +++---------- .../integration_tests.py | 27 +++++++++++++++ 5 files changed, 71 insertions(+), 19 deletions(-) create mode 100644 tests/include/testhelper.py rename tests/{linux_package_tests => include}/testset.py (100%) create mode 100644 tests/windows_installer_tests/integration_tests.py diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fce0682e4b5..402b7988a86 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -101,6 +101,12 @@ jobs: working-directory: win_build\Build\${{matrix.platform}}\${{matrix.configuration}} run: ${{github.workspace}}\temp\OpenCppCoverage\OpenCppCoverage-x64\OpenCppCoverage.exe --cover_children --optimized_build --sources ${{github.workspace}} --export_type=cobertura:cobertura.xml -- unittests.exe --gtest_output=xml:gtest.xml + - name: Run installation + if: success() && matrix.platform == 'x64' && matrix.type == 'msbuild' + shell: powershell + run: | + Start-Process "msiexec.exe" -ArgumentList "/i ${{github.workspace}}\win_build\Build\x64\${{matrix.configuration}}\boinc.msi /quiet /qn /l*v ${{github.workspace}}\win_build\Build\x64\${{matrix.configuration}}\install.log" -Wait + - name: Prepare logs on failure if: ${{failure()}} run: | diff --git a/tests/include/testhelper.py b/tests/include/testhelper.py new file mode 100644 index 00000000000..b235850b5a6 --- /dev/null +++ b/tests/include/testhelper.py @@ -0,0 +1,34 @@ +# This file is part of BOINC. +# https://boinc.berkeley.edu +# Copyright (C) 2024 University of California +# +# BOINC is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License +# as published by the Free Software Foundation, +# either version 3 of the License, or (at your option) any later version. +# +# BOINC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with BOINC. If not, see . + +import re + +class TestHelper: + def get_current_version_number(self): + with open("version.h", "r") as f: + lines = f.readlines() + for line in lines: + res = re.search("#define BOINC_VERSION_STRING \"([\d]+.[\d]+.[\d]+)\"", line) + if res is not None: + return res[1] + return "" + + def get_version_from_string(self, string): + res = re.search("([\d]+.[\d]+.[\d]+)", string) + if res is not None: + return res[1] + return "" diff --git a/tests/linux_package_tests/testset.py b/tests/include/testset.py similarity index 100% rename from tests/linux_package_tests/testset.py rename to tests/include/testset.py diff --git a/tests/linux_package_tests/integration_tests.py b/tests/linux_package_tests/integration_tests.py index 297501278d4..719d46684db 100644 --- a/tests/linux_package_tests/integration_tests.py +++ b/tests/linux_package_tests/integration_tests.py @@ -17,9 +17,9 @@ import os import pathlib -import re import sys -import testset +import tests.include.testset as testset +import tests.include.testhelper as testhelper class IntegrationTests: def __init__(self): @@ -37,23 +37,8 @@ def _get_test_executable_file_path(self, filename): return os.path.join(p, filename) return "" - def _get_current_version_number(self): - with open("version.h", "r") as f: - lines = f.readlines() - for line in lines: - res = re.search("#define BOINC_VERSION_STRING \"([\d]+.[\d]+.[\d]+)\"", line) - if res is not None: - return res[1] - return "" - - def _get_version_from_string(self, string): - res = re.search("([\d]+.[\d]+.[\d]+)", string) - if res is not None: - return res[1] - return "" - def _get_file_version(self, filename): - return self._get_version_from_string(os.popen(("{app} --version").format(app=self._get_test_executable_file_path(filename))).read().strip()) + return testhelper.get_version_from_string(os.popen(("{app} --version").format(app=self._get_test_executable_file_path(filename))).read().strip()) def _get_user_exists(self, username): return os.popen("id -un {username}".format(username=username)).read().strip() == username @@ -142,7 +127,7 @@ def test_files_exist(self): def test_version(self): ts = testset.TestSet("Test version is correct") - current_version = self._get_current_version_number() + current_version = testhelper.get_current_version_number() ts.expect_not_equal("", current_version, "Test current version could be read from the 'version.h' file") ts.expect_equal(current_version, self._get_file_version("boinc"), "Test 'boinc' version is correctly set") ts.expect_equal(current_version, self._get_file_version("boinccmd"), "Test 'boinccmd' version is correctly set") diff --git a/tests/windows_installer_tests/integration_tests.py b/tests/windows_installer_tests/integration_tests.py new file mode 100644 index 00000000000..6b4e9bce4a4 --- /dev/null +++ b/tests/windows_installer_tests/integration_tests.py @@ -0,0 +1,27 @@ +# This file is part of BOINC. +# https://boinc.berkeley.edu +# Copyright (C) 2024 University of California +# +# BOINC is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License +# as published by the Free Software Foundation, +# either version 3 of the License, or (at your option) any later version. +# +# BOINC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with BOINC. If not, see . + +import tests.include.testset as testset +import tests.include.testhelper as testhelper + +class IntegrationTests: + def __init__(self): + self.result = True + self.result &= test_general_installation() + + def test_general_installation(self): + ts = testset.TestSet("Test general installation") \ No newline at end of file