fix choices test, run zsh completion install test in a sanitary environment

Author: bckohan

tests/shellcompletion/__init__.py

@@ -502,7 +502,7 @@ def test_multi_install(self):
 
     if platform.system() != "Windows":
 
-        def test_prompt_install(self):
+        def test_prompt_install(self, env={}):
             import pexpect
 
             rex = re.compile
@@ -523,7 +523,7 @@ def test_prompt_install(self):
             self.remove()
             self.verify_remove()
 
-            install = pexpect.spawn(self.manage_script, install_command)
+            install = pexpect.spawn(self.manage_script, install_command, env=env)
 
             def wait_for_output(child) -> t.Tuple[int, t.Optional[str]]:
                 index = child.expect(expected)
@@ -547,7 +547,7 @@ def wait_for_output(child) -> t.Tuple[int, t.Optional[str]]:
             self.verify_remove()
 
             # test an install
-            install = pexpect.spawn(self.manage_script, install_command)
+            install = pexpect.spawn(self.manage_script, install_command, env=env)
 
             while True:
                 idx, _ = wait_for_output(install)

tests/shellcompletion/test_zsh.py

@@ -5,6 +5,7 @@
 from django.test import TestCase, override_settings
 import sys
 import os
+import platform
 
 from tests.shellcompletion import (
     _ScriptCompleteTestCase,
@@ -61,3 +62,11 @@ def test_no_zshrc_file(self):
     @override_settings(TEMPLATES=[])
     def test_no_template_config(self):
         self.test_shell_complete()
+
+    if platform.system() != "Windows":
+
+        def test_prompt_install(self, env={}):
+            zdot_dir = Path(__file__).parent / "zdotdir"
+            zdot_dir.mkdir(exist_ok=True)
+            super().test_prompt_install(env={"ZDOTDIR": str(zdot_dir.absolute())})
+            shutil.rmtree(zdot_dir)

tests/test_parser_completers.py

@@ -2537,9 +2537,9 @@ def test_choices_completer(self):
                         set([comp[0] for comp in completions]),
                     )
                     # verify helps
-                    if not self.shellcompletion.shell != "bash":
+                    if self.shellcompletion.shell != "bash":
                         for val, help_txt in completions:
-                            self.assertEqual(help_txt, field_choices[value])
+                            self.assertEqual(help_txt, field_choices[type(value)(val)])
 
         # sanity check!
         self.assertEqual(n_tests, 872)