refactor: test: update cases and expectations

Signed-off-by: Hiroshi Miura <[email protected]>

Author: miurahr

aqt/installer.py

@@ -166,8 +166,7 @@ def __init__(self):
             title="subcommands",
             description="aqt accepts several subcommands:\n"
             "install-* subcommands are commands that install components\n"
-            "list-* subcommands are commands that show available components\n\n"
-            "commands {install|tool|src|examples|doc} are deprecated and marked for removal\n",
+            "list-* subcommands are commands that show available components\n",
             help="Please refer to each help message by using '--help' with each subcommand",
         )
         self._make_all_parsers(subparsers)

tests/test_cli.py

@@ -16,8 +16,7 @@ def expected_help(actual, prefix=None):
     expected = (
         "usage: aqt [-h] [-c CONFIG]\n"
         "           {install-qt,install-tool,install-doc,install-example,install-src,"
-        "list-qt,list-tool,list-doc,list-example,list-src,"
-        "install,tool,doc,examples,src,help,version}\n"
+        "list-qt,list-tool,list-doc,list-example,list-src,help,version}\n"
         "           ...\n"
         "\n"
         "Another unofficial Qt Installer.\n"
@@ -32,13 +31,9 @@ def expected_help(actual, prefix=None):
         "  aqt accepts several subcommands:\n"
         "  install-* subcommands are commands that install components\n"
         "  list-* subcommands are commands that show available components\n"
-        "  \n"
-        "  commands {install|tool|src|examples|doc} are deprecated and marked for "
-        "removal\n"
         "\n"
         "  {install-qt,install-tool,install-doc,install-example,install-src,list-qt,"
-        "list-tool,list-doc,list-example,list-src,"
-        "install,tool,doc,examples,src,help,version}\n"
+        "list-tool,list-doc,list-example,list-src,help,version}\n"
         "                        Please refer to each help message by using '--help' "
         "with each subcommand\n",
     )
@@ -110,14 +105,12 @@ def test_cli_invalid_version(capsys, invalid_version):
     cli._setup_settings()
 
     matcher = re.compile(
-        r"^INFO    : aqtinstall\(aqt\) v.* on Python 3.*\n"
+      #  r"^INFO    : aqtinstall\(aqt\) v.* on Python 3.*\n"
         r"(.*\n)*"
         r"ERROR   :.*Invalid version: '" + invalid_version + r"'! Please use the form '5\.X\.Y'\.\n.*"
     )
 
     for cmd in (
-        ("install", invalid_version, "mac", "desktop"),
-        ("doc", invalid_version, "mac", "desktop"),
         ("list-qt", "mac", "desktop", "--arch", invalid_version),
     ):
         cli = Cli()

tests/test_install.py

@@ -354,45 +354,6 @@ def tool_archive(host: str, tool_name: str, variant: str, date: datetime = datet
                 r"INFO    : Time elapsed: .* second"
             ),
         ),
-        (
-            "tool linux tools_qtcreator 1.2.3-0-197001020304 qt.tools.qtcreator".split(),
-            "linux",
-            "desktop",
-            "1.2.3",
-            {"std": ""},
-            {"std": ""},
-            {"std": "linux_x64/desktop/tools_qtcreator/Updates.xml"},
-            {"std": [tool_archive("linux", "tools_qtcreator", "qt.tools.qtcreator", datetime(1970, 1, 2, 3, 4, 5, 6))]},
-            re.compile(
-                r"^INFO    : aqtinstall\(aqt\) v.* on Python 3.*\n"
-                r"WARNING : The command 'tool' is deprecated and marked for removal in a future version of aqt.\n"
-                r"In the future, please use the command 'install-tool' instead.\n"
-                r"INFO    : Downloading qt.tools.qtcreator...\n"
-                r"Finished installation of tools_qtcreator-linux-qt.tools.qtcreator.7z in .*\n"
-                r"INFO    : Finished installation\n"
-                r"INFO    : Time elapsed: .* second"
-            ),
-        ),
-        (
-            "install 5.14.0 windows desktop win32_mingw73".split(),
-            "windows",
-            "desktop",
-            "5.14.0",
-            {"std": "win32_mingw73"},
-            {"std": "mingw73_32"},
-            {"std": "windows_x86/desktop/qt5_5140/Updates.xml"},
-            {"std": [plain_qtbase_archive("qt.qt5.5140.win32_mingw73", "win32_mingw73")]},
-            re.compile(
-                r"^INFO    : aqtinstall\(aqt\) v.* on Python 3.*\n"
-                r"WARNING : The command 'install' is deprecated"
-                r" and marked for removal in a future version of aqt.\n"
-                r"In the future, please use the command 'install-qt' instead.\n"
-                r"INFO    : Downloading qtbase...\n"
-                r"Finished installation of qtbase-windows-win32_mingw73.7z in .*\n"
-                r"INFO    : Finished installation\n"
-                r"INFO    : Time elapsed: .* second"
-            ),
-        ),
         (  # Mixing --modules with --archives
             "install-qt windows desktop 5.14.0 win32_mingw73 -m qtcharts --archives qtbase".split(),
             "windows",