raise when executable location not found

spyoungtech · Dec 15, 2018 · a1c5a91 · a1c5a91
1 parent 86a3524
commit a1c5a91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ahk/script.py b/ahk/script.py
@@ -7,17 +7,19 @@
 
 logger = make_logger(__name__)
 
+
 class ExecutableNotFoundError(EnvironmentError):
     pass
 
+
 class ScriptEngine(object):
     def __init__(self, executable_path: str='', **kwargs):
         """
         :param executable_path: the path to the AHK executable.
         Defaults to environ['AHK_PATH'] if not explicitly provided
         If environment variable not present, tries to look for 'AutoHotkey.exe' or 'AutoHotkeyA32.exe' with shutil.which
         :param keep_scripts:
-        :raises RuntimeError: if AHK executable is not provided and cannot be found in environment variables or PATH
+        :raises ExecutableNotFound: if AHK executable is not provided and cannot be found in environment variables or PATH
         """
         if not executable_path:
             executable_path = os.environ.get('AHK_PATH') or which('AutoHotkey.exe') or which('AutoHotkeyA32.exe')

diff --git a/tests/unittests/test_executable_location.py b/tests/unittests/test_executable_location.py
@@ -22,7 +22,7 @@ def check_pwd():
 
 def test_no_executable_raises_error():
     check_pwd()
-    with mock.patch.dict(os.environ, {'PATH': ''}):
+    with mock.patch.dict(os.environ, {'PATH': ''}, clear=True):
         with pytest.raises(ExecutableNotFoundError):
             AHK()
 
@@ -47,6 +47,6 @@ def test_executable_from_path():
     check_pwd()
     actual_path = AHK().executable_path
     ahk_location = os.path.abspath(os.path.dirname(actual_path))
-    with mock.patch.dict(os.environ, {'PATH': ahk_location}):
+    with mock.patch.dict(os.environ, {'PATH': ahk_location}, clear=True):
         ahk = AHK()
         assert ahk.executable_path == actual_path