Raise error if library not found, before attempting to load it (#1992)

* Raise error if library not found, before attempting to load it

* add test_get_uninstalled_driver_library_raises_driver_not_installed_error

* Update changelog

* rename test

Author: ni-jfitzger

CHANGELOG.md

@@ -36,6 +36,7 @@ All notable changes to this project will be documented in this file.
 * ### ALL
     * #### Added
     * #### Changed
+        * Fix [#1970](https://github.com/ni/nimi-python/issues/1970): Incorrect error when driver runtime not installed.
     * #### Removed
         * Support for Python 3.7
 * ### `nidcpower` (NI-DCPower)

build/templates/_library_singleton.py.mako

@@ -23,7 +23,10 @@ _library_info = ${helper.get_dictionary_snippet(config['library_info'], indent=1
 
 def _get_library_name():
     try:
-        return ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        lib_name = ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        if lib_name is None:
+            raise errors.DriverNotInstalledError()
+        return lib_name
     except KeyError:
         raise errors.UnsupportedConfigurationError
 

generated/nidcpower/nidcpower/_library_singleton.py

@@ -19,7 +19,10 @@
 
 def _get_library_name():
     try:
-        return ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        lib_name = ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        if lib_name is None:
+            raise errors.DriverNotInstalledError()
+        return lib_name
     except KeyError:
         raise errors.UnsupportedConfigurationError
 

generated/nidigital/nidigital/_library_singleton.py

@@ -19,7 +19,10 @@
 
 def _get_library_name():
     try:
-        return ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        lib_name = ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        if lib_name is None:
+            raise errors.DriverNotInstalledError()
+        return lib_name
     except KeyError:
         raise errors.UnsupportedConfigurationError
 

generated/nidmm/nidmm/_library_singleton.py

@@ -19,7 +19,10 @@
 
 def _get_library_name():
     try:
-        return ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        lib_name = ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        if lib_name is None:
+            raise errors.DriverNotInstalledError()
+        return lib_name
     except KeyError:
         raise errors.UnsupportedConfigurationError
 

generated/nifake/nifake/_library_singleton.py

@@ -19,7 +19,10 @@
 
 def _get_library_name():
     try:
-        return ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        lib_name = ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        if lib_name is None:
+            raise errors.DriverNotInstalledError()
+        return lib_name
     except KeyError:
         raise errors.UnsupportedConfigurationError
 

generated/nifake/nifake/unit_tests/test_library_singleton.py

@@ -0,0 +1,7 @@
+import nifake
+import pytest
+
+
+def test_driver_runtime_not_installed_raises_driver_not_installed_error():
+    with pytest.raises(nifake.errors.DriverNotInstalledError):
+        nifake._library_singleton.get()

generated/nifgen/nifgen/_library_singleton.py

@@ -19,7 +19,10 @@
 
 def _get_library_name():
     try:
-        return ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        lib_name = ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        if lib_name is None:
+            raise errors.DriverNotInstalledError()
+        return lib_name
     except KeyError:
         raise errors.UnsupportedConfigurationError
 

generated/nimodinst/nimodinst/_library_singleton.py

@@ -19,7 +19,10 @@
 
 def _get_library_name():
     try:
-        return ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        lib_name = ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        if lib_name is None:
+            raise errors.DriverNotInstalledError()
+        return lib_name
     except KeyError:
         raise errors.UnsupportedConfigurationError
 

generated/niscope/niscope/_library_singleton.py

@@ -19,7 +19,10 @@
 
 def _get_library_name():
     try:
-        return ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        lib_name = ctypes.util.find_library(_library_info[platform.system()][platform.architecture()[0]]['name'])  # We find and return full path to the DLL
+        if lib_name is None:
+            raise errors.DriverNotInstalledError()
+        return lib_name
     except KeyError:
         raise errors.UnsupportedConfigurationError