From 17dd643a47e545c37d54473948b0f9c61eec2fd5 Mon Sep 17 00:00:00 2001 From: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com> Date: Sun, 12 Jan 2025 03:41:02 +0100 Subject: [PATCH] Fix tests --- tests/test_cli.py | 6 ++++-- tests/test_install.py | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/test_cli.py b/tests/test_cli.py index fc45d667..517d00e2 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -16,7 +16,8 @@ def expected_help(actual, prefix=None): expected = ( "usage: aqt [-h] [-c CONFIG]\n" - " {install-qt,install-tool,install-doc,install-example,install-src," + " {install-qt,install-tool,install-qt-commercial,install-doc,install-example," + "install-src," "list-qt,list-tool,list-doc,list-example,list-src,help,version}\n" " ...\n" "\n" @@ -33,7 +34,8 @@ def expected_help(actual, prefix=None): " install-* subcommands are commands that install components\n" " list-* subcommands are commands that show available components\n" "\n" - " {install-qt,install-tool,install-doc,install-example,install-src,list-qt," + " {install-qt,install-tool,install-qt-commercial,install-doc,install-example," + "install-src,list-qt," "list-tool,list-doc,list-example,list-src,help,version}\n" " Please refer to each help message by using '--help' " "with each subcommand\n", diff --git a/tests/test_install.py b/tests/test_install.py index a200bc10..b2a6adb7 100644 --- a/tests/test_install.py +++ b/tests/test_install.py @@ -2061,7 +2061,20 @@ def mock_get_url(url: str, *args, **kwargs) -> str: "cmd, arch_dict, details, expected_command", [ ( - "install-qt-commercial desktop {} 6.8.0 " "--outputdir ./install-qt-commercial " "--user {} --password {}", + "install-qt-commercial desktop {} 6.8.0 " "--outputdir .c " "--user {} --password {}", + {"windows": "win64_msvc2022_64", "linux": "linux_gcc_64", "mac": "clang_64"}, + ["./install-qt-commercial", "qt6", "680"], + "qt-unified-{}-x64-online.run --email ******** --pw ******** --root {} " + "--accept-licenses --accept-obligations " + "--confirm-command " + "--auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=No," + "stopProcessesForUpdates=Cancel,installationErrorWithCancel=Cancel,installationErrorWithIgnore=Ignore," + "AssociateCommonFiletypes=Yes,telemetry-question=No install qt.{}.{}.{}", + ), + ( + "install-qt-commercial --override --email {} --pw {} --root " + "/home/kidev/override_test " + "--accept-licenses --accept-obligations --confirm-command --auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=No,stopProcessesForUpdates=Cancel,installationErrorWithCancel=Cancel,installationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No install qt.qt6.681.linux_gcc_64", {"windows": "win64_msvc2022_64", "linux": "linux_gcc_64", "mac": "clang_64"}, ["./install-qt-commercial", "qt6", "680"], "qt-unified-{}-x64-online.run --email ******** --pw ******** --root {} "