Skip to content

Commit 0790ad3

Browse files
committed
Fix test
1 parent c13bbc2 commit 0790ad3

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

aqt/installer.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1619,8 +1619,6 @@ def install(self) -> None:
16191619
self.logger.info(f"Downloading Qt installer to {installer_path}")
16201620
self._download_installer(installer_path)
16211621

1622-
self.logger.info("Starting Qt installation")
1623-
16241622
try:
16251623
cmd = self._get_install_command(installer_path)
16261624
safe_cmd = cmd.copy()

tests/test_install.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,14 +2056,16 @@ def mock_get_url(url: str, *args, **kwargs) -> str:
20562056
assert expect_out.match(err), err
20572057

20582058

2059+
@pytest.mark.enable_socket
20592060
@pytest.mark.parametrize(
20602061
"cmd, arch_dict, details, expected_command",
20612062
[
20622063
(
2063-
"install-qt-commercial desktop {} 6.8.0 " "--outputdir ./install-qt-commercial " "--user {} --password {}",
2064+
"install-qt-commercial desktop {} 6.8.0 " "--outputdir /tmp/install-qt-commercial " "--user {} --password {}",
20642065
{"windows": "win64_msvc2022_64", "linux": "linux_gcc_64", "mac": "clang_64"},
2065-
["./install-qt-commercial", "qt6", "681"],
2066-
"qt-unified-{}-online.run --email ******** --pw ******** --root {} --accept-licenses --accept-obligations "
2066+
["/tmp/install-qt-commercial", "qt6", "680"],
2067+
"qt-unified-{}-x64-online.run --email ******** --pw ******** --root {} "
2068+
"--accept-licenses --accept-obligations "
20672069
"--confirm-command "
20682070
"--auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=No,"
20692071
"stopProcessesForUpdates=Cancel,installationErrorWithCancel=Cancel,installationErrorWithIgnore=Ignore,"
@@ -2079,12 +2081,12 @@ def test_install_qt_commercial(
20792081
arch = arch_dict[current_platform]
20802082

20812083
formatted_cmd = cmd.format(arch, "[email protected]", "WxK43TdWCTmxsrrpnsWbjPfPXVq3mtLK")
2082-
formatted_expected = expected_command.format(arch, *details, arch)
2084+
formatted_expected = expected_command.format(current_platform, *details, arch)
20832085

20842086
cli = Cli()
20852087
cli._setup_settings()
20862088

20872089
cli.run(formatted_cmd.split())
20882090

2089-
[out, _] = capsys.readouterr()
2090-
assert str(out).find(formatted_expected)
2091+
out = " ".join(capsys.readouterr())
2092+
assert str(out).find(formatted_expected) >= 0

0 commit comments

Comments
 (0)