flask8 fixes 2

Author: prathameshnium

tests/test_gui_iv_k2400.py

@@ -68,5 +68,4 @@ def test_start_measurement_logic(self, mock_fig_subplots, MockBackend):
         self.assertAlmostEqual(passed_params['max_current'], 100e-6)
 
         # 3. Did the GUI generate the correct sweep points?
-        mock_backend_instance.generate_sweep_points.assert_called_once()
-        
+        mock_backend_instance.generate_sweep_points.assert_called_once()

tests/test_iv_k6517b_simple_backend.py

@@ -1,27 +1,20 @@
 import unittest
-from unittest.mock import patch, MagicMock, mock_open
-import numpy as np
+from unittest.mock import patch, MagicMock, mock_open, call
 
 # 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.adapters.visa.VISAAdapter') # New patch
-    @patch('Keithley_6517B.High_Resistance.Backends.IV_K6517B_Simple_Backend_v10.Keithley6517B')
+    @patch('pymeasure.instruments.keithley.Keithley6517B')
     @patch('builtins.open', new_callable=mock_open)
     @patch('matplotlib.pyplot.show')
-    def test_full_run(self, mock_show, mock_file, mock_keithley_class, mock_visa_adapter, mock_input):
+    def test_full_run(self, mock_show, mock_file, mock_keithley_class, mock_input):
         """
         Tests a complete, successful run of the IV_K6517B_Simple_Backend script.
         """
-        # --- MOCK SETUP for VISAAdapter ---
-        mock_visa_adapter_instance = MagicMock()
-        mock_visa_adapter.return_value = mock_visa_adapter_instance
-        # Simulate IDN query result that Keithley6517B might perform
-        mock_visa_adapter_instance.ask.return_value = "Mocked Keithley 6517B ID"
-
         # --- Setup Mocks for Keithley6517B ---
         mock_instrument = MagicMock()
         mock_keithley_class.return_value = mock_instrument
@@ -30,13 +23,12 @@ def test_full_run(self, mock_show, mock_file, mock_keithley_class, mock_visa_ada
         # Simulate resistance measurement
         mock_instrument.resistance = 1.23e9
 
-
         # --- Run the main function and catch exceptions ---
         try:
             iv_simple_main()
         except Exception as e:
             # The script might exit or raise an error after plotting, which is fine for this test
-            if "no display name" not in str(e): # Ignore matplotlib display errors in CI
+            if "no display name" not in str(e):  # Ignore matplotlib display errors in CI
                 pass
 
         # --- Assertions ---

tests/test_pica_launcher.py

@@ -1,7 +1,5 @@
 import unittest
-from unittest.mock import patch, MagicMock
-import sys
-import os
+from unittest.mock import patch
 
 # -----------------------------------------------------------------------------
 # MOCK HELPER CLASSES for GUI Testing
@@ -21,6 +19,7 @@ def invoke(self):
         if self.command:
             self.command()
 
+
 class MockPicaLauncher:
     """
     Simulates the PICA_v6.py launcher class structure.
@@ -30,7 +29,6 @@ def __init__(self):
         # Attach MockTkWidget to simulate the 'command' binding for the button
         self.button_iv_sweep = MockTkWidget(command=self.open_iv_sweep)
         self.button_temp_control = MockTkWidget(command=self.open_temp_control)
-        
         # Internal state tracker to confirm methods are called
         self.open_gui_calls = {'iv_sweep': 0, 'temp_control': 0}
 
@@ -57,40 +55,34 @@ class TestPicaLauncher(unittest.TestCase):
     def test_iv_sweep_button_click_calls_function(self, mock_open_iv_sweep):
         """Tests that clicking the IV Sweep button calls its launch function once."""
         launcher = MockPicaLauncher()
-        
         # Simulate button click
         launcher.button_iv_sweep.invoke()
 
         # Assert the mocked function was called
         mock_open_iv_sweep.assert_called_once()
-        
         # Assert the internal counter was incremented
         self.assertEqual(launcher.open_gui_calls['iv_sweep'], 1)
 
     @patch('test_pica_launcher.MockPicaLauncher.open_temp_control')
     def test_temp_control_button_click_calls_function(self, mock_open_temp_control):
         """Tests that clicking the Temp Control button calls its launch function once."""
         launcher = MockPicaLauncher()
-        
         # Simulate button click
         launcher.button_temp_control.invoke()
 
         # Assert the mocked function was called
         mock_open_temp_control.assert_called_once()
-        
         # Assert the internal counter was incremented
         self.assertEqual(launcher.open_gui_calls['temp_control'], 1)
 
     def test_multiple_clicks(self):
         """Tests that multiple clicks correctly register multiple calls."""
         launcher = MockPicaLauncher()
-        
         # Simulate multiple clicks
         for _ in range(3):
             launcher.button_iv_sweep.invoke()
-        
         self.assertEqual(launcher.open_gui_calls['iv_sweep'], 3)
-        self.assertEqual(launcher.open_gui_calls['temp_control'], 0) # Ensure others are not called
+        self.assertEqual(launcher.open_gui_calls['temp_control'], 0)  # Ensure others are not called
 
 
 if __name__ == '__main__':