From 82373f8b5298755a852405492d3539511e1b1a9b Mon Sep 17 00:00:00 2001 From: zoechanzy Date: Mon, 29 Jun 2026 01:50:21 -0500 Subject: [PATCH 1/6] Added self.set_session_handle() --- .../_get_error_description.py.mako | 10 ++++++++++ generated/nidcpower/nidcpower/_library_interpreter.py | 10 ++++++++++ generated/nidigital/nidigital/_library_interpreter.py | 10 ++++++++++ generated/nidmm/nidmm/_library_interpreter.py | 10 ++++++++++ generated/nifake/nifake/_library_interpreter.py | 10 ++++++++++ generated/nifgen/nifgen/_library_interpreter.py | 10 ++++++++++ generated/niscope/niscope/_library_interpreter.py | 10 ++++++++++ generated/niswitch/niswitch/_library_interpreter.py | 10 ++++++++++ 8 files changed, 80 insertions(+) diff --git a/build/templates/_library_interpreter.py/_get_error_description.py.mako b/build/templates/_library_interpreter.py/_get_error_description.py.mako index b2d68496be..e937fb304e 100644 --- a/build/templates/_library_interpreter.py/_get_error_description.py.mako +++ b/build/templates/_library_interpreter.py/_get_error_description.py.mako @@ -20,12 +20,22 @@ pass % if 'error_message' in config['functions']: + try: + ''' + It is possible that the session is valid but the returned_error_code unequal to error_code + ''' + error_string = self.error_message(error_code) + return error_string + except errors.Error: + pass + try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nidcpower/nidcpower/_library_interpreter.py b/generated/nidcpower/nidcpower/_library_interpreter.py index 473680f188..7ce7ae3913 100644 --- a/generated/nidcpower/nidcpower/_library_interpreter.py +++ b/generated/nidcpower/nidcpower/_library_interpreter.py @@ -103,12 +103,22 @@ def get_error_description(self, error_code): except errors.Error: pass + try: + ''' + It is possible that the session is valid but the returned_error_code unequal to error_code + ''' + error_string = self.error_message(error_code) + return error_string + except errors.Error: + pass + try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nidigital/nidigital/_library_interpreter.py b/generated/nidigital/nidigital/_library_interpreter.py index e830756ab8..a97018732e 100644 --- a/generated/nidigital/nidigital/_library_interpreter.py +++ b/generated/nidigital/nidigital/_library_interpreter.py @@ -101,12 +101,22 @@ def get_error_description(self, error_code): except errors.Error: pass + try: + ''' + It is possible that the session is valid but the returned_error_code unequal to error_code + ''' + error_string = self.error_message(error_code) + return error_string + except errors.Error: + pass + try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nidmm/nidmm/_library_interpreter.py b/generated/nidmm/nidmm/_library_interpreter.py index 4e87b4274b..76e5c6475f 100644 --- a/generated/nidmm/nidmm/_library_interpreter.py +++ b/generated/nidmm/nidmm/_library_interpreter.py @@ -99,12 +99,22 @@ def get_error_description(self, error_code): except errors.Error: pass + try: + ''' + It is possible that the session is valid but the returned_error_code unequal to error_code + ''' + error_string = self.error_message(error_code) + return error_string + except errors.Error: + pass + try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nifake/nifake/_library_interpreter.py b/generated/nifake/nifake/_library_interpreter.py index 45ca3ef39a..a6e0291145 100644 --- a/generated/nifake/nifake/_library_interpreter.py +++ b/generated/nifake/nifake/_library_interpreter.py @@ -115,12 +115,22 @@ def get_error_description(self, error_code): except errors.Error: pass + try: + ''' + It is possible that the session is valid but the returned_error_code unequal to error_code + ''' + error_string = self.error_message(error_code) + return error_string + except errors.Error: + pass + try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nifgen/nifgen/_library_interpreter.py b/generated/nifgen/nifgen/_library_interpreter.py index 6370353a26..7c32eb64e6 100644 --- a/generated/nifgen/nifgen/_library_interpreter.py +++ b/generated/nifgen/nifgen/_library_interpreter.py @@ -99,12 +99,22 @@ def get_error_description(self, error_code): except errors.Error: pass + try: + ''' + It is possible that the session is valid but the returned_error_code unequal to error_code + ''' + error_string = self.error_message(error_code) + return error_string + except errors.Error: + pass + try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/niscope/niscope/_library_interpreter.py b/generated/niscope/niscope/_library_interpreter.py index 1cb9a7d26a..8427d4ac5c 100644 --- a/generated/niscope/niscope/_library_interpreter.py +++ b/generated/niscope/niscope/_library_interpreter.py @@ -103,12 +103,22 @@ def get_error_description(self, error_code): except errors.Error: pass + try: + ''' + It is possible that the session is valid but the returned_error_code unequal to error_code + ''' + error_string = self.error_message(error_code) + return error_string + except errors.Error: + pass + try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/niswitch/niswitch/_library_interpreter.py b/generated/niswitch/niswitch/_library_interpreter.py index 4d7dc8ea7c..daf3ed06e2 100644 --- a/generated/niswitch/niswitch/_library_interpreter.py +++ b/generated/niswitch/niswitch/_library_interpreter.py @@ -99,12 +99,22 @@ def get_error_description(self, error_code): except errors.Error: pass + try: + ''' + It is possible that the session is valid but the returned_error_code unequal to error_code + ''' + error_string = self.error_message(error_code) + return error_string + except errors.Error: + pass + try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: From ab14a933eeed8c13e7c0309386c2dd476161138f Mon Sep 17 00:00:00 2001 From: zoechanzy Date: Mon, 29 Jun 2026 09:21:08 -0500 Subject: [PATCH 2/6] Add unit test --- .../unit_tests/test_library_interpreter.py | 30 +++++++++++++++++++ .../unit_tests/test_library_interpreter.py | 30 +++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/generated/nifake/nifake/unit_tests/test_library_interpreter.py b/generated/nifake/nifake/unit_tests/test_library_interpreter.py index 6bcc6ebc55..8a7c5f8e02 100644 --- a/generated/nifake/nifake/unit_tests/test_library_interpreter.py +++ b/generated/nifake/nifake/unit_tests/test_library_interpreter.py @@ -716,6 +716,36 @@ def test_get_error_description_error_message_error(self): assert e.description == test_error_desc self.patched_library.niFake_error_message.assert_called_once_with(_matchers.ViSessionMatcher(SESSION_NUM_FOR_TEST), _matchers.ViInt32Matcher(test_error_code), _matchers.ViCharBufferMatcher(256)) + def test_get_error_description_error_message_after_session_reset(self): + test_error_code = -42 + test_error_desc = "The answer to the ultimate question" + self.patched_library.niFake_PoorlyNamedSimpleFunction.side_effect = self.side_effects_helper.niFake_PoorlyNamedSimpleFunction + self.side_effects_helper['PoorlyNamedSimpleFunction']['return'] = test_error_code + self.patched_library.niFake_GetError.side_effect = self.side_effects_helper.niFake_GetError + self.side_effects_helper['GetError']['errorCode'] = -1 + self.side_effects_helper['GetError']['description'] = "Shouldn't get this" + self.side_effects_helper['GetError']['return'] = -2 + self.side_effects_helper['error_message']['errorMessage'] = test_error_desc + + def error_message_side_effect(vi, error_code, error_message_buf): + if vi.value == SESSION_NUM_FOR_TEST: + return -3 + return self.side_effects_helper.niFake_error_message(vi, error_code, error_message_buf) + + self.patched_library.niFake_error_message.side_effect = error_message_side_effect + interpreter = self.get_initialized_library_interpreter() + try: + interpreter.simple_function() + assert False + except nifake.Error as e: + assert e.code == test_error_code + assert e.description == test_error_desc + assert self.patched_library.niFake_error_message.call_count == 2 + self.patched_library.niFake_error_message.assert_has_calls([ + call(_matchers.ViSessionMatcher(SESSION_NUM_FOR_TEST), _matchers.ViInt32Matcher(test_error_code), _matchers.ViCharBufferMatcher(256)), + call(_matchers.ViSessionMatcher(0), _matchers.ViInt32Matcher(test_error_code), _matchers.ViCharBufferMatcher(256)), + ]) + # Custom types def test_set_custom_type(self): diff --git a/src/nifake/unit_tests/test_library_interpreter.py b/src/nifake/unit_tests/test_library_interpreter.py index 6bcc6ebc55..8a7c5f8e02 100644 --- a/src/nifake/unit_tests/test_library_interpreter.py +++ b/src/nifake/unit_tests/test_library_interpreter.py @@ -716,6 +716,36 @@ def test_get_error_description_error_message_error(self): assert e.description == test_error_desc self.patched_library.niFake_error_message.assert_called_once_with(_matchers.ViSessionMatcher(SESSION_NUM_FOR_TEST), _matchers.ViInt32Matcher(test_error_code), _matchers.ViCharBufferMatcher(256)) + def test_get_error_description_error_message_after_session_reset(self): + test_error_code = -42 + test_error_desc = "The answer to the ultimate question" + self.patched_library.niFake_PoorlyNamedSimpleFunction.side_effect = self.side_effects_helper.niFake_PoorlyNamedSimpleFunction + self.side_effects_helper['PoorlyNamedSimpleFunction']['return'] = test_error_code + self.patched_library.niFake_GetError.side_effect = self.side_effects_helper.niFake_GetError + self.side_effects_helper['GetError']['errorCode'] = -1 + self.side_effects_helper['GetError']['description'] = "Shouldn't get this" + self.side_effects_helper['GetError']['return'] = -2 + self.side_effects_helper['error_message']['errorMessage'] = test_error_desc + + def error_message_side_effect(vi, error_code, error_message_buf): + if vi.value == SESSION_NUM_FOR_TEST: + return -3 + return self.side_effects_helper.niFake_error_message(vi, error_code, error_message_buf) + + self.patched_library.niFake_error_message.side_effect = error_message_side_effect + interpreter = self.get_initialized_library_interpreter() + try: + interpreter.simple_function() + assert False + except nifake.Error as e: + assert e.code == test_error_code + assert e.description == test_error_desc + assert self.patched_library.niFake_error_message.call_count == 2 + self.patched_library.niFake_error_message.assert_has_calls([ + call(_matchers.ViSessionMatcher(SESSION_NUM_FOR_TEST), _matchers.ViInt32Matcher(test_error_code), _matchers.ViCharBufferMatcher(256)), + call(_matchers.ViSessionMatcher(0), _matchers.ViInt32Matcher(test_error_code), _matchers.ViCharBufferMatcher(256)), + ]) + # Custom types def test_set_custom_type(self): From 57887507b6ae90105fcb59e0aaad2a9e181f0ef0 Mon Sep 17 00:00:00 2001 From: zoechanzy Date: Wed, 1 Jul 2026 19:25:55 -0500 Subject: [PATCH 3/6] Use comment instead of docstring --- .../_library_interpreter.py/_get_error_description.py.mako | 4 +--- generated/nidcpower/nidcpower/_library_interpreter.py | 4 +--- generated/nidigital/nidigital/_library_interpreter.py | 4 +--- generated/nidmm/nidmm/_library_interpreter.py | 4 +--- generated/nifake/nifake/_library_interpreter.py | 4 +--- generated/nifgen/nifgen/_library_interpreter.py | 4 +--- generated/niscope/niscope/_library_interpreter.py | 4 +--- generated/niswitch/niswitch/_library_interpreter.py | 4 +--- 8 files changed, 8 insertions(+), 24 deletions(-) diff --git a/build/templates/_library_interpreter.py/_get_error_description.py.mako b/build/templates/_library_interpreter.py/_get_error_description.py.mako index e937fb304e..7f1514be29 100644 --- a/build/templates/_library_interpreter.py/_get_error_description.py.mako +++ b/build/templates/_library_interpreter.py/_get_error_description.py.mako @@ -21,9 +21,7 @@ % if 'error_message' in config['functions']: try: - ''' - It is possible that the session is valid but the returned_error_code unequal to error_code - ''' + # It is possible that the session is valid but the returned_error_code unequal to error_code error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nidcpower/nidcpower/_library_interpreter.py b/generated/nidcpower/nidcpower/_library_interpreter.py index 7ce7ae3913..16f30923bf 100644 --- a/generated/nidcpower/nidcpower/_library_interpreter.py +++ b/generated/nidcpower/nidcpower/_library_interpreter.py @@ -104,9 +104,7 @@ def get_error_description(self, error_code): pass try: - ''' - It is possible that the session is valid but the returned_error_code unequal to error_code - ''' + # It is possible that the session is valid but the returned_error_code unequal to error_code error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nidigital/nidigital/_library_interpreter.py b/generated/nidigital/nidigital/_library_interpreter.py index a97018732e..75f800eca5 100644 --- a/generated/nidigital/nidigital/_library_interpreter.py +++ b/generated/nidigital/nidigital/_library_interpreter.py @@ -102,9 +102,7 @@ def get_error_description(self, error_code): pass try: - ''' - It is possible that the session is valid but the returned_error_code unequal to error_code - ''' + # It is possible that the session is valid but the returned_error_code unequal to error_code error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nidmm/nidmm/_library_interpreter.py b/generated/nidmm/nidmm/_library_interpreter.py index 76e5c6475f..f24a741304 100644 --- a/generated/nidmm/nidmm/_library_interpreter.py +++ b/generated/nidmm/nidmm/_library_interpreter.py @@ -100,9 +100,7 @@ def get_error_description(self, error_code): pass try: - ''' - It is possible that the session is valid but the returned_error_code unequal to error_code - ''' + # It is possible that the session is valid but the returned_error_code unequal to error_code error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nifake/nifake/_library_interpreter.py b/generated/nifake/nifake/_library_interpreter.py index a6e0291145..30fdd15d19 100644 --- a/generated/nifake/nifake/_library_interpreter.py +++ b/generated/nifake/nifake/_library_interpreter.py @@ -116,9 +116,7 @@ def get_error_description(self, error_code): pass try: - ''' - It is possible that the session is valid but the returned_error_code unequal to error_code - ''' + # It is possible that the session is valid but the returned_error_code unequal to error_code error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/nifgen/nifgen/_library_interpreter.py b/generated/nifgen/nifgen/_library_interpreter.py index 7c32eb64e6..94c36080b3 100644 --- a/generated/nifgen/nifgen/_library_interpreter.py +++ b/generated/nifgen/nifgen/_library_interpreter.py @@ -100,9 +100,7 @@ def get_error_description(self, error_code): pass try: - ''' - It is possible that the session is valid but the returned_error_code unequal to error_code - ''' + # It is possible that the session is valid but the returned_error_code unequal to error_code error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/niscope/niscope/_library_interpreter.py b/generated/niscope/niscope/_library_interpreter.py index 8427d4ac5c..792a8d45e7 100644 --- a/generated/niscope/niscope/_library_interpreter.py +++ b/generated/niscope/niscope/_library_interpreter.py @@ -104,9 +104,7 @@ def get_error_description(self, error_code): pass try: - ''' - It is possible that the session is valid but the returned_error_code unequal to error_code - ''' + # It is possible that the session is valid but the returned_error_code unequal to error_code error_string = self.error_message(error_code) return error_string except errors.Error: diff --git a/generated/niswitch/niswitch/_library_interpreter.py b/generated/niswitch/niswitch/_library_interpreter.py index daf3ed06e2..3daa0e19a9 100644 --- a/generated/niswitch/niswitch/_library_interpreter.py +++ b/generated/niswitch/niswitch/_library_interpreter.py @@ -100,9 +100,7 @@ def get_error_description(self, error_code): pass try: - ''' - It is possible that the session is valid but the returned_error_code unequal to error_code - ''' + # It is possible that the session is valid but the returned_error_code unequal to error_code error_string = self.error_message(error_code) return error_string except errors.Error: From 4b16c37c39f5a86bec190b27322adaed20f2e4a7 Mon Sep 17 00:00:00 2001 From: zoechanzy Date: Wed, 1 Jul 2026 19:58:37 -0500 Subject: [PATCH 4/6] Update get_error_description --- .../_library_interpreter.py/_get_error_description.py.mako | 3 +++ generated/nidcpower/nidcpower/_library_interpreter.py | 3 +++ generated/nidigital/nidigital/_library_interpreter.py | 3 +++ generated/nidmm/nidmm/_library_interpreter.py | 3 +++ generated/nifake/nifake/_library_interpreter.py | 3 +++ generated/nifgen/nifgen/_library_interpreter.py | 3 +++ generated/niscope/niscope/_library_interpreter.py | 3 +++ generated/niswitch/niswitch/_library_interpreter.py | 3 +++ 8 files changed, 24 insertions(+) diff --git a/build/templates/_library_interpreter.py/_get_error_description.py.mako b/build/templates/_library_interpreter.py/_get_error_description.py.mako index 7f1514be29..4021e0b31a 100644 --- a/build/templates/_library_interpreter.py/_get_error_description.py.mako +++ b/build/templates/_library_interpreter.py/_get_error_description.py.mako @@ -33,10 +33,13 @@ (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: pass + finally: + self.set_session_handle(save_vi) % endif return "Failed to retrieve error description." diff --git a/generated/nidcpower/nidcpower/_library_interpreter.py b/generated/nidcpower/nidcpower/_library_interpreter.py index 16f30923bf..51193e217e 100644 --- a/generated/nidcpower/nidcpower/_library_interpreter.py +++ b/generated/nidcpower/nidcpower/_library_interpreter.py @@ -116,11 +116,14 @@ def get_error_description(self, error_code): (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: pass + finally: + self.set_session_handle(save_vi) return "Failed to retrieve error description." def abort(self, channel_name): # noqa: N802 diff --git a/generated/nidigital/nidigital/_library_interpreter.py b/generated/nidigital/nidigital/_library_interpreter.py index 75f800eca5..3c6172d122 100644 --- a/generated/nidigital/nidigital/_library_interpreter.py +++ b/generated/nidigital/nidigital/_library_interpreter.py @@ -114,11 +114,14 @@ def get_error_description(self, error_code): (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: pass + finally: + self.set_session_handle(save_vi) return "Failed to retrieve error description." def abort(self): # noqa: N802 diff --git a/generated/nidmm/nidmm/_library_interpreter.py b/generated/nidmm/nidmm/_library_interpreter.py index f24a741304..182ef9948c 100644 --- a/generated/nidmm/nidmm/_library_interpreter.py +++ b/generated/nidmm/nidmm/_library_interpreter.py @@ -112,11 +112,14 @@ def get_error_description(self, error_code): (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: pass + finally: + self.set_session_handle(save_vi) return "Failed to retrieve error description." def abort(self): # noqa: N802 diff --git a/generated/nifake/nifake/_library_interpreter.py b/generated/nifake/nifake/_library_interpreter.py index 30fdd15d19..79bd50ae8c 100644 --- a/generated/nifake/nifake/_library_interpreter.py +++ b/generated/nifake/nifake/_library_interpreter.py @@ -128,11 +128,14 @@ def get_error_description(self, error_code): (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: pass + finally: + self.set_session_handle(save_vi) return "Failed to retrieve error description." def abort(self): # noqa: N802 diff --git a/generated/nifgen/nifgen/_library_interpreter.py b/generated/nifgen/nifgen/_library_interpreter.py index 94c36080b3..c421f34b3c 100644 --- a/generated/nifgen/nifgen/_library_interpreter.py +++ b/generated/nifgen/nifgen/_library_interpreter.py @@ -112,11 +112,14 @@ def get_error_description(self, error_code): (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: pass + finally: + self.set_session_handle(save_vi) return "Failed to retrieve error description." def abort(self): # noqa: N802 diff --git a/generated/niscope/niscope/_library_interpreter.py b/generated/niscope/niscope/_library_interpreter.py index 792a8d45e7..2a378e6f27 100644 --- a/generated/niscope/niscope/_library_interpreter.py +++ b/generated/niscope/niscope/_library_interpreter.py @@ -116,11 +116,14 @@ def get_error_description(self, error_code): (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: pass + finally: + self.set_session_handle(save_vi) return "Failed to retrieve error description." def abort(self): # noqa: N802 diff --git a/generated/niswitch/niswitch/_library_interpreter.py b/generated/niswitch/niswitch/_library_interpreter.py index 3daa0e19a9..d1add509b0 100644 --- a/generated/niswitch/niswitch/_library_interpreter.py +++ b/generated/niswitch/niswitch/_library_interpreter.py @@ -112,11 +112,14 @@ def get_error_description(self, error_code): (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' + save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string except errors.Error: pass + finally: + self.set_session_handle(save_vi) return "Failed to retrieve error description." def abort(self): # noqa: N802 From d239d81e4e810d36b956da6eaa8df23acc6189b2 Mon Sep 17 00:00:00 2001 From: zoechanzy Date: Thu, 2 Jul 2026 02:31:24 -0500 Subject: [PATCH 5/6] Save session before next try block --- .../_library_interpreter.py/_get_error_description.py.mako | 2 +- generated/nidcpower/nidcpower/_library_interpreter.py | 2 +- generated/nidigital/nidigital/_library_interpreter.py | 2 +- generated/nidmm/nidmm/_library_interpreter.py | 2 +- generated/nifake/nifake/_library_interpreter.py | 2 +- generated/nifgen/nifgen/_library_interpreter.py | 2 +- generated/niscope/niscope/_library_interpreter.py | 2 +- generated/niswitch/niswitch/_library_interpreter.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/templates/_library_interpreter.py/_get_error_description.py.mako b/build/templates/_library_interpreter.py/_get_error_description.py.mako index 4021e0b31a..3797f99874 100644 --- a/build/templates/_library_interpreter.py/_get_error_description.py.mako +++ b/build/templates/_library_interpreter.py/_get_error_description.py.mako @@ -27,13 +27,13 @@ except errors.Error: pass + save_vi = self.get_session_handle() try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' - save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nidcpower/nidcpower/_library_interpreter.py b/generated/nidcpower/nidcpower/_library_interpreter.py index 51193e217e..ff7dd0e096 100644 --- a/generated/nidcpower/nidcpower/_library_interpreter.py +++ b/generated/nidcpower/nidcpower/_library_interpreter.py @@ -110,13 +110,13 @@ def get_error_description(self, error_code): except errors.Error: pass + save_vi = self.get_session_handle() try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' - save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nidigital/nidigital/_library_interpreter.py b/generated/nidigital/nidigital/_library_interpreter.py index 3c6172d122..eafa22daed 100644 --- a/generated/nidigital/nidigital/_library_interpreter.py +++ b/generated/nidigital/nidigital/_library_interpreter.py @@ -108,13 +108,13 @@ def get_error_description(self, error_code): except errors.Error: pass + save_vi = self.get_session_handle() try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' - save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nidmm/nidmm/_library_interpreter.py b/generated/nidmm/nidmm/_library_interpreter.py index 182ef9948c..b7e5d64f89 100644 --- a/generated/nidmm/nidmm/_library_interpreter.py +++ b/generated/nidmm/nidmm/_library_interpreter.py @@ -106,13 +106,13 @@ def get_error_description(self, error_code): except errors.Error: pass + save_vi = self.get_session_handle() try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' - save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nifake/nifake/_library_interpreter.py b/generated/nifake/nifake/_library_interpreter.py index 79bd50ae8c..3c88634cb0 100644 --- a/generated/nifake/nifake/_library_interpreter.py +++ b/generated/nifake/nifake/_library_interpreter.py @@ -122,13 +122,13 @@ def get_error_description(self, error_code): except errors.Error: pass + save_vi = self.get_session_handle() try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' - save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nifgen/nifgen/_library_interpreter.py b/generated/nifgen/nifgen/_library_interpreter.py index c421f34b3c..b25aa332c0 100644 --- a/generated/nifgen/nifgen/_library_interpreter.py +++ b/generated/nifgen/nifgen/_library_interpreter.py @@ -106,13 +106,13 @@ def get_error_description(self, error_code): except errors.Error: pass + save_vi = self.get_session_handle() try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' - save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/niscope/niscope/_library_interpreter.py b/generated/niscope/niscope/_library_interpreter.py index 2a378e6f27..c91f555a9a 100644 --- a/generated/niscope/niscope/_library_interpreter.py +++ b/generated/niscope/niscope/_library_interpreter.py @@ -110,13 +110,13 @@ def get_error_description(self, error_code): except errors.Error: pass + save_vi = self.get_session_handle() try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' - save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/niswitch/niswitch/_library_interpreter.py b/generated/niswitch/niswitch/_library_interpreter.py index d1add509b0..2eb7aab3b2 100644 --- a/generated/niswitch/niswitch/_library_interpreter.py +++ b/generated/niswitch/niswitch/_library_interpreter.py @@ -106,13 +106,13 @@ def get_error_description(self, error_code): except errors.Error: pass + save_vi = self.get_session_handle() try: ''' It is expected for get_error to raise when the session is invalid (IVI spec requires GetError to fail). Use error_message instead. It doesn't require a session. ''' - save_vi = self.get_session_handle() self.set_session_handle() error_string = self.error_message(error_code) return error_string From dfb69f2e0a3dd6c120c317aadbb9ba9da7dcb8c2 Mon Sep 17 00:00:00 2001 From: zoechanzy Date: Thu, 2 Jul 2026 09:15:29 -0500 Subject: [PATCH 6/6] Update comments --- .../_get_error_description.py.mako | 16 ++++++++++------ .../nidcpower/nidcpower/_library_interpreter.py | 16 ++++++++++------ .../nidigital/nidigital/_library_interpreter.py | 16 ++++++++++------ generated/nidmm/nidmm/_library_interpreter.py | 16 ++++++++++------ generated/nifake/nifake/_library_interpreter.py | 16 ++++++++++------ generated/nifgen/nifgen/_library_interpreter.py | 16 ++++++++++------ .../niscope/niscope/_library_interpreter.py | 16 ++++++++++------ .../niswitch/niswitch/_library_interpreter.py | 16 ++++++++++------ 8 files changed, 80 insertions(+), 48 deletions(-) diff --git a/build/templates/_library_interpreter.py/_get_error_description.py.mako b/build/templates/_library_interpreter.py/_get_error_description.py.mako index 3797f99874..c72587a5fa 100644 --- a/build/templates/_library_interpreter.py/_get_error_description.py.mako +++ b/build/templates/_library_interpreter.py/_get_error_description.py.mako @@ -21,7 +21,12 @@ % if 'error_message' in config['functions']: try: - # It is possible that the session is valid but the returned_error_code unequal to error_code + # get_error reads the session's error queue, which may have been overwritten, + # causing it to return a mismatched error code. error_message takes the error + # code directly as a parameter and looks up its description without reading the + # queue, it will return the description for the specific error code. + # Use error_message in current session before the handle reset in the next block. + error_string = self.error_message(error_code) return error_string except errors.Error: @@ -29,11 +34,10 @@ save_vi = self.get_session_handle() try: - ''' - It is expected for get_error to raise when the session is invalid - (IVI spec requires GetError to fail). - Use error_message instead. It doesn't require a session. - ''' + # It is expected for get_error to raise when the session is invalid + # (IVI spec requires GetError to fail). + # Use error_message instead. It doesn't require a session. + self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nidcpower/nidcpower/_library_interpreter.py b/generated/nidcpower/nidcpower/_library_interpreter.py index ff7dd0e096..09640eca56 100644 --- a/generated/nidcpower/nidcpower/_library_interpreter.py +++ b/generated/nidcpower/nidcpower/_library_interpreter.py @@ -104,7 +104,12 @@ def get_error_description(self, error_code): pass try: - # It is possible that the session is valid but the returned_error_code unequal to error_code + # get_error reads the session's error queue, which may have been overwritten, + # causing it to return a mismatched error code. error_message takes the error + # code directly as a parameter and looks up its description without reading the + # queue, it will return the description for the specific error code. + # Use error_message in current session before the handle reset in the next block. + error_string = self.error_message(error_code) return error_string except errors.Error: @@ -112,11 +117,10 @@ def get_error_description(self, error_code): save_vi = self.get_session_handle() try: - ''' - It is expected for get_error to raise when the session is invalid - (IVI spec requires GetError to fail). - Use error_message instead. It doesn't require a session. - ''' + # It is expected for get_error to raise when the session is invalid + # (IVI spec requires GetError to fail). + # Use error_message instead. It doesn't require a session. + self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nidigital/nidigital/_library_interpreter.py b/generated/nidigital/nidigital/_library_interpreter.py index eafa22daed..8c00b6c500 100644 --- a/generated/nidigital/nidigital/_library_interpreter.py +++ b/generated/nidigital/nidigital/_library_interpreter.py @@ -102,7 +102,12 @@ def get_error_description(self, error_code): pass try: - # It is possible that the session is valid but the returned_error_code unequal to error_code + # get_error reads the session's error queue, which may have been overwritten, + # causing it to return a mismatched error code. error_message takes the error + # code directly as a parameter and looks up its description without reading the + # queue, it will return the description for the specific error code. + # Use error_message in current session before the handle reset in the next block. + error_string = self.error_message(error_code) return error_string except errors.Error: @@ -110,11 +115,10 @@ def get_error_description(self, error_code): save_vi = self.get_session_handle() try: - ''' - It is expected for get_error to raise when the session is invalid - (IVI spec requires GetError to fail). - Use error_message instead. It doesn't require a session. - ''' + # It is expected for get_error to raise when the session is invalid + # (IVI spec requires GetError to fail). + # Use error_message instead. It doesn't require a session. + self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nidmm/nidmm/_library_interpreter.py b/generated/nidmm/nidmm/_library_interpreter.py index b7e5d64f89..6de856e8c1 100644 --- a/generated/nidmm/nidmm/_library_interpreter.py +++ b/generated/nidmm/nidmm/_library_interpreter.py @@ -100,7 +100,12 @@ def get_error_description(self, error_code): pass try: - # It is possible that the session is valid but the returned_error_code unequal to error_code + # get_error reads the session's error queue, which may have been overwritten, + # causing it to return a mismatched error code. error_message takes the error + # code directly as a parameter and looks up its description without reading the + # queue, it will return the description for the specific error code. + # Use error_message in current session before the handle reset in the next block. + error_string = self.error_message(error_code) return error_string except errors.Error: @@ -108,11 +113,10 @@ def get_error_description(self, error_code): save_vi = self.get_session_handle() try: - ''' - It is expected for get_error to raise when the session is invalid - (IVI spec requires GetError to fail). - Use error_message instead. It doesn't require a session. - ''' + # It is expected for get_error to raise when the session is invalid + # (IVI spec requires GetError to fail). + # Use error_message instead. It doesn't require a session. + self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nifake/nifake/_library_interpreter.py b/generated/nifake/nifake/_library_interpreter.py index 3c88634cb0..1df2f18b87 100644 --- a/generated/nifake/nifake/_library_interpreter.py +++ b/generated/nifake/nifake/_library_interpreter.py @@ -116,7 +116,12 @@ def get_error_description(self, error_code): pass try: - # It is possible that the session is valid but the returned_error_code unequal to error_code + # get_error reads the session's error queue, which may have been overwritten, + # causing it to return a mismatched error code. error_message takes the error + # code directly as a parameter and looks up its description without reading the + # queue, it will return the description for the specific error code. + # Use error_message in current session before the handle reset in the next block. + error_string = self.error_message(error_code) return error_string except errors.Error: @@ -124,11 +129,10 @@ def get_error_description(self, error_code): save_vi = self.get_session_handle() try: - ''' - It is expected for get_error to raise when the session is invalid - (IVI spec requires GetError to fail). - Use error_message instead. It doesn't require a session. - ''' + # It is expected for get_error to raise when the session is invalid + # (IVI spec requires GetError to fail). + # Use error_message instead. It doesn't require a session. + self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/nifgen/nifgen/_library_interpreter.py b/generated/nifgen/nifgen/_library_interpreter.py index b25aa332c0..5ff00c7150 100644 --- a/generated/nifgen/nifgen/_library_interpreter.py +++ b/generated/nifgen/nifgen/_library_interpreter.py @@ -100,7 +100,12 @@ def get_error_description(self, error_code): pass try: - # It is possible that the session is valid but the returned_error_code unequal to error_code + # get_error reads the session's error queue, which may have been overwritten, + # causing it to return a mismatched error code. error_message takes the error + # code directly as a parameter and looks up its description without reading the + # queue, it will return the description for the specific error code. + # Use error_message in current session before the handle reset in the next block. + error_string = self.error_message(error_code) return error_string except errors.Error: @@ -108,11 +113,10 @@ def get_error_description(self, error_code): save_vi = self.get_session_handle() try: - ''' - It is expected for get_error to raise when the session is invalid - (IVI spec requires GetError to fail). - Use error_message instead. It doesn't require a session. - ''' + # It is expected for get_error to raise when the session is invalid + # (IVI spec requires GetError to fail). + # Use error_message instead. It doesn't require a session. + self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/niscope/niscope/_library_interpreter.py b/generated/niscope/niscope/_library_interpreter.py index c91f555a9a..2c6097bbf7 100644 --- a/generated/niscope/niscope/_library_interpreter.py +++ b/generated/niscope/niscope/_library_interpreter.py @@ -104,7 +104,12 @@ def get_error_description(self, error_code): pass try: - # It is possible that the session is valid but the returned_error_code unequal to error_code + # get_error reads the session's error queue, which may have been overwritten, + # causing it to return a mismatched error code. error_message takes the error + # code directly as a parameter and looks up its description without reading the + # queue, it will return the description for the specific error code. + # Use error_message in current session before the handle reset in the next block. + error_string = self.error_message(error_code) return error_string except errors.Error: @@ -112,11 +117,10 @@ def get_error_description(self, error_code): save_vi = self.get_session_handle() try: - ''' - It is expected for get_error to raise when the session is invalid - (IVI spec requires GetError to fail). - Use error_message instead. It doesn't require a session. - ''' + # It is expected for get_error to raise when the session is invalid + # (IVI spec requires GetError to fail). + # Use error_message instead. It doesn't require a session. + self.set_session_handle() error_string = self.error_message(error_code) return error_string diff --git a/generated/niswitch/niswitch/_library_interpreter.py b/generated/niswitch/niswitch/_library_interpreter.py index 2eb7aab3b2..06f44037b6 100644 --- a/generated/niswitch/niswitch/_library_interpreter.py +++ b/generated/niswitch/niswitch/_library_interpreter.py @@ -100,7 +100,12 @@ def get_error_description(self, error_code): pass try: - # It is possible that the session is valid but the returned_error_code unequal to error_code + # get_error reads the session's error queue, which may have been overwritten, + # causing it to return a mismatched error code. error_message takes the error + # code directly as a parameter and looks up its description without reading the + # queue, it will return the description for the specific error code. + # Use error_message in current session before the handle reset in the next block. + error_string = self.error_message(error_code) return error_string except errors.Error: @@ -108,11 +113,10 @@ def get_error_description(self, error_code): save_vi = self.get_session_handle() try: - ''' - It is expected for get_error to raise when the session is invalid - (IVI spec requires GetError to fail). - Use error_message instead. It doesn't require a session. - ''' + # It is expected for get_error to raise when the session is invalid + # (IVI spec requires GetError to fail). + # Use error_message instead. It doesn't require a session. + self.set_session_handle() error_string = self.error_message(error_code) return error_string