diff options
Diffstat (limited to 'packaging-tools/tests/test_build_wrapper.py')
| -rw-r--r-- | packaging-tools/tests/test_build_wrapper.py | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/packaging-tools/tests/test_build_wrapper.py b/packaging-tools/tests/test_build_wrapper.py index 47a9ac157..3082f219c 100644 --- a/packaging-tools/tests/test_build_wrapper.py +++ b/packaging-tools/tests/test_build_wrapper.py @@ -3,7 +3,7 @@ ############################################################################# # -# Copyright (C) 2022 The Qt Company Ltd. +# Copyright (C) 2023 The Qt Company Ltd. # Contact: https://www.qt.io/licensing/ # # This file is part of the release tools of the Qt Toolkit. @@ -29,15 +29,13 @@ # ############################################################################# -import os import unittest from getpass import getuser -from glob import glob from pathlib import Path -from tempfile import TemporaryDirectory from typing import Dict from ddt import data, ddt, unpack # type: ignore +from temppathlib import TemporaryDirectory from build_wrapper import init_snapshot_dir_and_upload_files @@ -56,25 +54,26 @@ class TestBuildWrapper(unittest.TestCase): self, project_name: str, version_branch: str, build_number: str, subdir: str = "" ) -> None: with TemporaryDirectory() as temp_dir: + work_dir = Path.cwd() option_dict: Dict[str, str] = { - 'WORK_DIR': str(Path.cwd()), 'SSH_COMMAND': 'ssh', 'SCP_COMMAND': 'scp', + 'WORK_DIR': str(work_dir), 'SSH_COMMAND': 'ssh', 'SCP_COMMAND': 'scp', 'PACKAGE_STORAGE_SERVER_ADDR': getuser() + '@127.0.0.1', - 'PACKAGE_STORAGE_SERVER_BASE_DIR': temp_dir + 'PACKAGE_STORAGE_SERVER_BASE_DIR': str(temp_dir.path) } - files_to_upload = [os.path.basename(x) for x in glob('./*.sh')] + files_to_upload = [x.name for x in work_dir.glob('*.sh')] init_snapshot_dir_and_upload_files( option_dict, project_name, version_branch, build_number, files_to_upload, subdir ) - remote_path_base = os.path.join(temp_dir, project_name, version_branch) - remote_path_snapshot_dir = os.path.join(remote_path_base, build_number) - remote_path_latest_link = os.path.join(remote_path_base, 'latest') - self.assertTrue(os.path.isdir(remote_path_base)) - self.assertTrue(os.path.isdir(remote_path_snapshot_dir)) - self.assertTrue(os.path.islink(remote_path_latest_link)) + remote_path_base = temp_dir.path / project_name / version_branch + remote_path_snapshot_dir = remote_path_base / build_number + remote_path_latest_link = remote_path_base / 'latest' + self.assertTrue(remote_path_base.is_dir()) + self.assertTrue(remote_path_snapshot_dir.is_dir()) + self.assertTrue(remote_path_latest_link.is_symlink()) - search_dir = os.path.join(remote_path_latest_link, subdir, '*.sh') - uploaded_files = [os.path.basename(x) for x in glob(search_dir)] + search_dir = remote_path_latest_link / subdir + uploaded_files = [x.name for x in search_dir.glob('*.sh')] self.assertListEqual(sorted(files_to_upload), sorted(uploaded_files)) |