Better override of startfile

Author: zooba

src/manage/firstrun.py

@@ -80,6 +80,7 @@ def do_configure_long_paths(
     hive=winreg.HKEY_LOCAL_MACHINE,
     keyname=_LONG_PATH_KEY,
     valuename=_LONG_PATH_VALUENAME,
+    startfile=os.startfile,
 ):
     LOGGER.debug("Updating long paths setting")
     try:
@@ -96,7 +97,7 @@ def do_configure_long_paths(
         LOGGER.warn("The setting has not been updated. Please rerun '!B!py "
                     "install --configure!W! with administrative privileges.")
         return
-    os.startfile(sys.executable, "runas", "**configure-long-paths", show_cmd=0)
+    startfile(sys.executable, "runas", "**configure-long-paths", show_cmd=0)
     for _ in range(5):
         time.sleep(0.25)
         if check_long_paths(cmd):

tests/test_firstrun.py

@@ -246,18 +246,16 @@ def test_check_long_paths(registry, fake_config):
 
 
 def test_do_configure_long_paths(registry, fake_config, monkeypatch):
-    monkeypatch.setattr(os, "startfile", _raise_oserror)
-    firstrun.do_configure_long_paths(fake_config, hive=registry.hive, keyname=registry.root)
+    firstrun.do_configure_long_paths(fake_config, hive=registry.hive, keyname=registry.root, startfile=_raise_oserror)
     assert winreg.QueryValueEx(registry.key, "LongPathsEnabled") == (1, winreg.REG_DWORD)
 
 
 def test_do_configure_long_paths_elevated(protect_reg, fake_config, monkeypatch):
     startfile_calls = []
     def startfile(*a, **kw):
         startfile_calls.append((a, kw))
-    monkeypatch.setattr(os, "startfile", startfile)
     # Pretend we can interact, so that os.startfile gets called
     fake_config.confirm = True
-    firstrun.do_configure_long_paths(fake_config)
+    firstrun.do_configure_long_paths(fake_config, startfile=startfile)
     assert startfile_calls
     assert startfile_calls[0][0][1:] == ("runas", "**configure-long-paths")