From 841389a60812dba9180b7c19f2f7b4b7a75440e5 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 11 Aug 2026 16:17:45 +0100 Subject: [PATCH 1/2] fix race --- system_tests/tests/keithley_2700.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/system_tests/tests/keithley_2700.py b/system_tests/tests/keithley_2700.py index 6aad963..8296bea 100644 --- a/system_tests/tests/keithley_2700.py +++ b/system_tests/tests/keithley_2700.py @@ -366,11 +366,13 @@ def test_GIVEN_buffer_almost_full_WHEN_buffer_fills_and_overflows_THEN_correct_r _insert_reading(self, reads[7:11]) self.ca.assert_that_pv_is("BUFF:NEXT", 1) - retrieved_readings = self.ca.get_pv_value("BUFF:READ")[:3] + def passes_check(readings): + readings = readings[:3] + int_readings = map(int, readings) + str_readings = map(str, int_readings) + return expected_read.replace("+", "") == ",".join(str_readings) - retrieved_readings = map(int, retrieved_readings) # map from float to int - retrieved_readings = map(str, retrieved_readings) # map from int to str - self.assertEqual(expected_read.replace("+", ""), ",".join(retrieved_readings)) + self.ca.assert_that_pv_value_causes_func_to_return_true("BUFF:READ", passes_check) class ChannelTests(unittest.TestCase): From 6403f78edea95b09299705d8eaf6b6c82b9a1a9b Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 11 Aug 2026 16:21:53 +0100 Subject: [PATCH 2/2] fmt --- system_tests/tests/keithley_2700.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/system_tests/tests/keithley_2700.py b/system_tests/tests/keithley_2700.py index 8296bea..3f8f75c 100644 --- a/system_tests/tests/keithley_2700.py +++ b/system_tests/tests/keithley_2700.py @@ -66,7 +66,7 @@ def _generate_readings(num_readings_gen, time_between, nan_timestamp=False): return readings -class Status(object): +class Status: ON = "ON" OFF = "OFF" @@ -110,8 +110,8 @@ def test_WHEN_source_set_THEN_source_matches_the_set_state(self): @skip_if_recsim("In rec sim this test fails") def test_WHEN_buffer_size_set_THEN_buffer_size_matches_the_set_state_AND_alarm_is_major(self): expected_alarm = "MAJOR" - sample_data = [-1, 0, 55001, 70000] - for sample_data in sample_data: + all_sample_data = [-1, 0, 55001, 70000] + for sample_data in all_sample_data: self.ca.assert_setting_setpoint_sets_readback( sample_data, "BUFF:SIZE", expected_alarm=expected_alarm ) @@ -119,8 +119,8 @@ def test_WHEN_buffer_size_set_THEN_buffer_size_matches_the_set_state_AND_alarm_i @skip_if_recsim("In rec sim this test fails") def test_WHEN_buffer_size_set_THEN_buffer_size_matches_the_set_state_AND_alarm_is_none(self): expected_alarm = "NO_ALARM" - sample_data = [5500, 2] - for sample_data in sample_data: + all_sample_data = [5500, 2] + for sample_data in all_sample_data: self.ca.assert_setting_setpoint_sets_readback( sample_data, "BUFF:SIZE", expected_alarm=expected_alarm ) @@ -246,7 +246,7 @@ def test_WHEN_measurement_mode_set_THEN_measurement_mode_matches_the_set_state(s 7: "FREQ", 8: "PER", } - for measurement_enum, measurement_string in sample_data.items(): + for measurement_string in sample_data.values(): self.ca.assert_setting_setpoint_sets_readback( measurement_string, "MEASUREMENT", expected_value=measurement_string ) @@ -458,7 +458,7 @@ def test_GIVEN_empty_buffer_WHEN_values_added_THEN_temp_AND_drift_correct( self.ca.set_pv_value("BUFF:SIZE:SP", 1000) # GIVEN in setup # WHEN - for i in range(0, len(test_data)): + for i in range(len(test_data)): _insert_reading(self, [readings[i]]) # THEN self.ca.assert_that_pv_is_number(