Skip to content

Fix race #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tom-Willemsen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix race #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
841389a
fix race
Tom-Willemsen Aug 11, 2026
6403f78
fmt
Tom-Willemsen Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions system_tests/tests/keithley_2700.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -110,17 +110,17 @@ 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
)

@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
)
Expand Down Expand Up @@ -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
)
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -456,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(
Expand Down