flask8 fixes 4

Author: prathameshnium

tests/test_deep_simulation.py

@@ -23,9 +23,11 @@ def tearDown(self):
     # -------------------------------------------------------------------------
     def _timeout_handler(self, signum, frame):
         raise TimeoutError(
-                            f"Test {self._testMethodName} took longer than 30s! Infinite Loop suspected.")
-    def run_module_safely(self, module_name, mock_modules):        """Imports and runs a module with a strict 30-second timeout."""
-        with patch.dict('sys.modules', mock_modules):
+            f"Test {self._testMethodName} took longer than 30s! Infinite Loop suspected.")
+
+    def run_module_safely(self, module_name, mock_modules):
+        """Imports and runs a module with a strict 30-second timeout."""
+        with patch.dict('sys.modules', mock_modules):  # type: ignore
             # Set an alarm for 30 seconds (Works on Linux/GitHub Actions)
             if hasattr(signal, 'SIGALRM'):
                 # Ensure any previous alarm is cleared
@@ -54,7 +56,7 @@ def run_module_safely(self, module_name, mock_modules):        """Imports and ru
                     raise e  # Re-raise to fail the test
                 else:
                     print(f"   -> [INFO] Script stopped with: {e}", flush=True)
-            
+
             finally:
                 if hasattr(signal, 'SIGALRM'):
                     signal.alarm(0)  # Disable the alarm
@@ -143,9 +145,9 @@ def test_02_lakeshore_backend(self):
             with patch('builtins.input', side_effect=['10', '300', '10', '350']), \
                     patch('builtins.open', mock_open()), \
                     patch('matplotlib.pyplot.show'), \
-                    patch('matplotlib.pyplot.subplots', return_value=(mock_fig, mock_ax)):
+                    patch('matplotlib.pyplot.subplots', return_value=(mock_fig, mock_ax)): # noqa
                 self.run_module_safely("Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10", mock_modules)
-    
+
     def test_03_k6517b_pyro_backend(self):
         mock_modules = {
             'tkinter': MagicMock(),
@@ -252,7 +254,8 @@ def test_06_delta_sensing(self):
             with patch('builtins.input', side_effect=inputs), \
                     patch('pandas.DataFrame.to_csv'):
                 try:
-                    self.run_module_safely("Delta_mode_Keithley_6221_2182.Backends.Delta_K6221_K2182_L350_T_Sensing_Backend_v1", mock_modules)
+                    self.run_module_safely(
+                        "Delta_mode_Keithley_6221_2182.Backends.Delta_K6221_K2182_L350_T_Sensing_Backend_v1", mock_modules)
                 except ModuleNotFoundError:
                     print("   [SKIP] Module not found, skipping.")
 
@@ -319,7 +322,8 @@ def test_08_combined_2400_2182(self):
             inputs = ['10', '1', 'test_file', 'y', 'y', 'y', 'y']
             with patch('builtins.input', side_effect=inputs), \
                     patch('pandas.DataFrame.to_csv'):
-                self.run_module_safely("Keithley_2400_Keithley_2182.Backends.IV_K2400_K2182_Backend_v1", mock_modules)
+                self.run_module_safely(
+                    "Keithley_2400_Keithley_2182.Backends.IV_K2400_K2182_Backend_v1", mock_modules)
             mock_pymeasure.stop()
 
     def test_09_poling(self):
@@ -414,9 +418,8 @@ def test_12_gpib_rescue(self):
             rm = MockRM.return_value
             rm.list_resources.return_value = ('GPIB0::1::INSTR',)
             self.run_module_safely(
-                                "Utilities.GPIB_Interface_Rescue_Simple_Backened_v2_", mock_modules)
-                
-                
-                if __name__ == '__main__':
-                    unittest.main()
-                
+                "Utilities.GPIB_Interface_Rescue_Simple_Backened_v2_", mock_modules)
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_fixes.py

@@ -15,7 +15,6 @@ def test_iv_k2400_fix(self, mock_to_csv, mock_plt_show, mock_keithley_class, moc
         IV_K2400_Loop_Backend_v10 script, preventing real hardware calls.
         """
         from Keithley_2400.Backends import IV_K2400_Loop_Backend_v10 as iv_backend
-
         mock_keithley_instance = MagicMock()
         mock_keithley_class.return_value = mock_keithley_instance
         mock_keithley_instance.query.return_value = "KEITHLEY INSTRUMENTS INC., MODEL 2400"
@@ -25,6 +24,7 @@ def test_iv_k2400_fix(self, mock_to_csv, mock_plt_show, mock_keithley_class, moc
 
     @patch('Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10.Lakeshore350')
     def test_t_control_l350_fix(self, mock_ls_class):
+
         from Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10 import main
 
         # Configure the mock Lakeshore350 instance that main() will receive

tests/test_gui_iv_k2400.py

@@ -13,7 +13,7 @@ def setUp(self):
         Set up a root Tk window and instantiate the GUI class.
         This runs before each test.
         """
-        # We need a root window for the GUI to be instantiated, but we don't need to see it.
+        # We need a root window for the GUI to be instantiated, but we don't need to see it
         self.root = tk.Tk()
         self.root.withdraw()  # Hide the window
 
@@ -41,11 +41,10 @@ def test_start_measurement_logic(self, mock_fig_subplots, MockBackend):
         # Mock the backend instance that the GUI will create
         mock_backend_instance = MockBackend.return_value
         # --- Simulate User Input ---
-        # We directly set the values that would be entered into the GUI's Entry widgets.
-        app.entries["Sample Name"].insert(0, "TestSample")
-        app.entries["Max Current"].insert(0, "100")  # 100 µA
-        app.entries["Step Current"].insert(0, "10")  # 10 µA
-        app.entries["Compliance"].insert(0, "20")    # 20 V
+        # We directly set the values that would be entered into the GUI's Entry widgets
+        app.entries["Sample Name"].insert(0, "TestSample") # 100 µA
+        app.entries["Max Current"].insert(0, "100") # 10 µA
+        app.entries["Step Current"].insert(0, "10") # 20 V
         app.entries["Delay"].insert(0, "0.5")    # 0.5 s
         app.keithley_combobox.set("GPIB0::24::INSTR")
         app.file_location_path = "/fake/path"  # Simulate browsing for a file

tests/test_iv_k2400_loop_backend.py

@@ -47,7 +47,7 @@ def ramp_side_effect(current):
 
         # --- ASSERTIONS ---
         # 1. Check instrument initialization
-        mock_keithley_class.assert_called_once_with("GPIB::4")
+        mock_keithley_class.assert_called_once_with("GPIB::4", adapter_args={'py_library': '@sim'})
         mock_keithley_instance.disable_buffer.assert_called_once()
 
         # 2. Check instrument configuration

tests/test_iv_k6517b_simple_backend.py

@@ -1,11 +1,11 @@
 import unittest
 from unittest.mock import patch, MagicMock, mock_open
-
 # Import the main function from the script we want to test
 from Keithley_6517B.High_Resistance.Backends.IV_K6517B_Simple_Backend_v10 import main as iv_simple_main
 
 
 class TestIVK6517BSimpleBackend(unittest.TestCase):
+
     @patch('time.sleep', MagicMock())
     @patch('builtins.input', side_effect=['-10', '10', '5', '0.1', 'test_iv_simple.csv'])
     @patch('pymeasure.instruments.keithley.Keithley6517B')
@@ -33,7 +33,7 @@ def test_full_run(self, mock_show, mock_file, mock_keithley_class, mock_input):
 
         # --- Assertions ---
         # 1. Was the instrument initialized correctly?
-        mock_keithley_class.assert_called_once_with("GPIB1::27::INSTR")
+        mock_keithley_class.assert_called_once_with("GPIB1::27::INSTR", adapter_args={'py_library': '@sim'})
 
         # 2. Was the zero-check and correction sequence performed?
         mock_instrument.reset.assert_called_once()

tests/test_live_plotter.py

@@ -3,46 +3,44 @@
 # This issue appears to be an environmental configuration problem rather than a bug in the code
 # being tested. Until the environment can correctly resolve matplotlib.animation, this test
 # cannot run.
+import unittest
 
-# import os
-# import unittest
-# import pandas as pd
-# import matplotlib.pyplot as plt
-# from unittest import mock
-# # from Utilities.LivePlotter_v10 import live_plot_from_csv # Commented out due to import error
-# import pytest
+import pandas as pd
+from unittest import mock
+import pytest
 
-# @pytest.fixture
-# def dummy_csv_file(tmp_path):
-#     # Create a dummy CSV file for testing
-#     data = {
-#         'Time (s)': [0, 1, 2, 3, 4],
-#         'Temperature (K)': [100, 110, 105, 115, 120],
-#         'Voltage (V)': [1, 1.1, 1.05, 1.15, 1.2]
-#     }
-#     df = pd.DataFrame(data)
-#     csv_path = tmp_path / "test_data.csv"
-#     df.to_csv(csv_path, index=False)
-#     return csv_path
+@pytest.fixture
+def dummy_csv_file(tmp_path):
+    # Create a dummy CSV file for testing
+    data = {
+        'Time (s)': [0, 1, 2, 3, 4],
+        'Temperature (K)': [100, 110, 105, 115, 120],
+        'Voltage (V)': [1, 1.1, 1.05, 1.15, 1.2]
+    }
+    df = pd.DataFrame(data)
+    csv_path = tmp_path / "test_data.csv"
+    df.to_csv(csv_path, index=False)
+    return csv_path
 
-# class TestLivePlotter(unittest.TestCase):
-#     @mock.patch('Utilities.LivePlotter_v10.select_file')
-#     @mock.patch('matplotlib.pyplot.show')
-#     @mock.patch('matplotlib.animation.FuncAnimation')
-#     def test_live_plot_from_csv(self, mock_animation, mock_show, mock_select_file, dummy_csv_file):
-#         """
-#         Tests that the live_plot_from_csv function can be called and attempts to plot.
-#         """
-#         # Have the mocked select_file return the path to our dummy file
-#         mock_select_file.return_value = str(dummy_csv_file)
 
-#         # We need to run the script's main execution block.
-#         # Since it's under `if __name__ == '__main__':`, we can import it.
-#         # The import itself will trigger the logic.
-#         with mock.patch('Utilities.LivePlotter_v10.live_plot_from_csv') as mock_live_plot:
-#             import Utilities.LivePlotter_v10
-#             # The main block calls live_plot_from_csv, so we check that
-#             mock_live_plot.assert_called_once()
+class TestLivePlotter(unittest.TestCase):
+    @mock.patch('Utilities.LivePlotter_v10.select_file')
+    @mock.patch('matplotlib.pyplot.show')
+    @mock.patch('matplotlib.animation.FuncAnimation')
+    def test_live_plot_from_csv(self, mock_animation, mock_show, mock_select_file, dummy_csv_file):
+        """
+        Tests that the live_plot_from_csv function can be called and attempts to plot.
+        """
+        # Have the mocked select_file return the path to our dummy file
+        mock_select_file.return_value = str(dummy_csv_file)
 
-# if __name__ == '__main__':
-#     unittest.main()
+        # We need to run the script's main execution block.
+        # Since it's under `if __name__ == '__main__':`, we can import it.
+        with mock.patch('Utilities.LivePlotter_v10.live_plot_from_csv') as mock_live_plot:
+            from Utilities import LivePlotter_v10 # noqa
+            # The main block calls live_plot_from_csv, so we check that
+            mock_live_plot.assert_called_once()
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_t_control_l350_backend.py

@@ -78,7 +78,7 @@ def test_close(self):
 
 class TestMainFunctionAndUserInput(unittest.TestCase):
     @patch('builtins.input', side_effect=['100', '200', '10', '300',
-                                        'not-a-number', '50', '350', '10', '400'])
+                                          'not-a-number', '50', '350', '10', '400'])
     def test_get_user_parameters(self, mock_input):
         # First call: Valid input
         start, end, rate, cutoff = get_user_parameters()
@@ -97,10 +97,9 @@ def test_get_user_parameters(self, mock_input):
     @patch('matplotlib.pyplot.show')
     @patch('builtins.open', new_callable=mock_open)
     @patch('time.sleep', MagicMock())
-    # Simulate time passing
     @patch('time.time', side_effect=[1000, 1002, 1004, 1006, 1008, 1010])
-    def test_main_runs_and_completes(self, mock_time, mock_open_file,
-                                     mock_plt_show, mock_ls_class, mock_input, mock_file_dialog, mock_tk):
+    def test_main_runs_and_completes(self, mock_time, mock_open_file, mock_plt_show, mock_ls_class,
+                                     mock_input, mock_file_dialog, mock_tk):
         # --- MOCK SETUP ---
         mock_controller = MagicMock()
         mock_ls_class.return_value = mock_controller
@@ -116,8 +115,7 @@ def test_main_runs_and_completes(self, mock_time, mock_open_file,
 
         # --- ASSERTIONS ---
         # Check initialization
-        mock_ls_class.assert_called_once_with(
-            "GPIB0::13::INSTR", adapter_args={'py_library': '@sim'})
+        mock_ls_class.assert_called_once_with("GPIB0::13::INSTR", adapter_args={'py_library': '@sim'})
         mock_controller.reset_and_clear.assert_called_once()
         mock_controller.setup_heater.assert_called_once()