Merge remote-tracking branch 'upstream/main' into gh-29

Author: zooba

ci/release.yml

@@ -292,6 +292,10 @@ jobs:
       displayName: 'Download PuTTY binaries'
 
     - powershell: |
+        # We don't want the Store MSIX on python.org, so just delete it
+        # It's already been archived in the earlier publish step, and is bundled
+        # into the .msixupload file.
+        del "$(UPLOAD_DIR)\*-store.msix" -ErrorAction SilentlyContinue
         python ci\upload.py
       displayName: 'Publish packages'
       env:

ci/upload.py

@@ -199,3 +199,6 @@ def purge(url):
     upload_ssh(f, p)
     print("Purge", u)
     purge(u)
+
+# Purge the upload directory so that the FTP browser is up to date
+purge(UPLOAD_URL)

src/manage/commands.py

@@ -874,12 +874,18 @@ def execute(self):
 class HelpWithErrorCommand(HelpCommand):
     CMD = "__help_with_error"
 
+    def __init__(self, args, root=None):
+        # Essentially disable argument processing for this command
+        super().__init__(args[:1], root)
+        self.args = args[1:]
+
     def execute(self):
-        LOGGER.print(f"!R!Unknown command: {EXE_NAME} {' '.join(self.args)}!W!")
+        args = [EXE_NAME, *self.args]
+        LOGGER.print(f"!R!Unknown command: {' '.join(args)}!W!")
         LOGGER.print(COPYRIGHT)
         self.show_welcome(copyright=False)
         LOGGER.print(BaseCommand.usage_text())
-        LOGGER.print(f"The command !R!{EXE_NAME} {' '.join(self.args)}!W! was not recognized.")
+        LOGGER.print(f"The command !R!{' '.join(args)}!W! was not recognized.")
 
 
 class DefaultConfig(BaseCommand):

tests/conftest.py

@@ -25,11 +25,31 @@
 LOGGER.level = DEBUG
 
 class LogCaptureHandler(list):
+    def skip_until(self, pattern, args=()):
+        return ('until', pattern, args)
+
     def __call__(self, *cmp):
-        for x, y in zip(self, cmp):
-            assert re.match(y[0], x[0])
-            assert x[1] == y[1]
-        assert len(self) == len(cmp)
+        it1 = iter(self)
+        for y in cmp:
+            if not isinstance(y, tuple):
+                op, pat, args = None, y, []
+            elif len(y) == 3:
+                op, pat, args = y
+            elif len(y) == 2:
+                op = None
+                pat, args = y
+
+            while True:
+                try:
+                    x = next(it1)
+                except StopIteration:
+                    pytest.fail(f"Not enough elements were logged looking for {pat}")
+                if op == 'until' and not re.match(pat, x[0]):
+                    continue
+                assert re.match(pat, x[0])
+                assert tuple(x[1]) == tuple(args)
+                break
+
 
 @pytest.fixture
 def assert_log():

tests/test_commands.py

@@ -0,0 +1,18 @@
+import pytest
+import secrets
+from manage import commands
+
+
+def test_help_with_error_command(assert_log, monkeypatch):
+    expect = secrets.token_hex(16)
+    cmd = commands.HelpWithErrorCommand(
+        [commands.HelpWithErrorCommand.CMD, expect, "-v", "-q"],
+        None
+    )
+    monkeypatch.setattr(commands, "WELCOME", "")
+    cmd.execute()
+    assert_log(
+        assert_log.skip_until(rf".*Unknown command: pymanager-pytest {expect} -v -q.*"),
+        r"Python installation manager \d+\.\d+.*",
+        assert_log.skip_until(rf"The command .*?pymanager-pytest {expect} -v -q.*"),
+    )