From a1597ecfc8d57108fc400641f1e8d9f28e736f93 Mon Sep 17 00:00:00 2001 From: Chsudeepta Date: Mon, 30 Mar 2026 14:49:54 +0100 Subject: [PATCH 1/3] Changes from JK --- common_tests/instron_base.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common_tests/instron_base.py b/common_tests/instron_base.py index 79d18f7c..a1cc23b0 100644 --- a/common_tests/instron_base.py +++ b/common_tests/instron_base.py @@ -675,7 +675,7 @@ def test_GIVEN_multiple_channels_WHEN_waveform_amplitude_is_set_THEN_the_device_ / float(self.ca.get_pv_value("STRESS:AREA")), float(self.ca.get_pv_value("STRAIN:SCALE")) * 100000 - * float(self.ca.get_pv_value("STRAIN:LENGTH")), + / float(self.ca.get_pv_value("STRAIN:LENGTH")), ] for i in range(len(conversion_factors)): @@ -696,16 +696,16 @@ def test_GIVEN_multiple_channels_WHEN_waveform_amplitude_is_set_THEN_the_device_ self.ca.set_pv_value("CHANNEL:SP.VAL", device_channel, sleep_after_set=1) self.ca.set_pv_value(self.wave_prefixed("AMP:SP"), input_values[device_channel]) self.ca.assert_that_pv_is(self.wave_prefixed("AMP"), expected_values[device_channel]) - self.ca.assert_that_pv_is( - self.wave_prefixed("AMP:SP:RBV"), input_values[device_channel] - ) + amplitude = "{:.1f}".format(self.ca.get_pv_value(self.wave_prefixed("AMP:SP:RBV"))) + self.assertEqual(float(amplitude), input_values[device_channel]) + self.ca.assert_that_pv_is(self.wave_prefixed("AMP:SP:_RAW"), expected_values[device_channel]) for device_channel in range(NUMBER_OF_CHANNELS): self.ca.set_pv_value("CHANNEL:SP.VAL", device_channel, sleep_after_set=1) self.ca.assert_that_pv_is(self.wave_prefixed("AMP"), expected_values[device_channel]) - self.ca.assert_that_pv_is( - self.wave_prefixed("AMP:SP:RBV"), input_values[device_channel] - ) + amplitude = "{:.1f}".format(self.ca.get_pv_value(self.wave_prefixed("AMP:SP:RBV"))) + self.assertEqual(float(amplitude), input_values[device_channel]) + @skip_if_recsim("RECSIM does not capture dynamic behaviour") def test_WHEN_the_quarter_counter_is_off_THEN_the_number_of_counts_is_and_remains_zero(self): From ed67a15e8cc6709f602c007890042d26c8202ef2 Mon Sep 17 00:00:00 2001 From: Chsudeepta Date: Tue, 31 Mar 2026 14:56:47 +0100 Subject: [PATCH 2/3] Changes from JK --- common_tests/instron_base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common_tests/instron_base.py b/common_tests/instron_base.py index a1cc23b0..28ea0a9d 100644 --- a/common_tests/instron_base.py +++ b/common_tests/instron_base.py @@ -698,7 +698,8 @@ def test_GIVEN_multiple_channels_WHEN_waveform_amplitude_is_set_THEN_the_device_ self.ca.assert_that_pv_is(self.wave_prefixed("AMP"), expected_values[device_channel]) amplitude = "{:.1f}".format(self.ca.get_pv_value(self.wave_prefixed("AMP:SP:RBV"))) self.assertEqual(float(amplitude), input_values[device_channel]) - self.ca.assert_that_pv_is(self.wave_prefixed("AMP:SP:_RAW"), expected_values[device_channel]) + self.ca.assert_that_pv_is( + self.wave_prefixed("AMP:SP:_RAW"), expected_values[device_channel]) for device_channel in range(NUMBER_OF_CHANNELS): self.ca.set_pv_value("CHANNEL:SP.VAL", device_channel, sleep_after_set=1) From a2d1e803d08dd5d06f81c034b231c6d7338e7a0d Mon Sep 17 00:00:00 2001 From: Chsudeepta Date: Fri, 17 Apr 2026 14:25:22 +0100 Subject: [PATCH 3/3] Fixed pyright and ruff issues --- common_tests/instron_base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common_tests/instron_base.py b/common_tests/instron_base.py index 28ea0a9d..8aea92a0 100644 --- a/common_tests/instron_base.py +++ b/common_tests/instron_base.py @@ -697,16 +697,16 @@ def test_GIVEN_multiple_channels_WHEN_waveform_amplitude_is_set_THEN_the_device_ self.ca.set_pv_value(self.wave_prefixed("AMP:SP"), input_values[device_channel]) self.ca.assert_that_pv_is(self.wave_prefixed("AMP"), expected_values[device_channel]) amplitude = "{:.1f}".format(self.ca.get_pv_value(self.wave_prefixed("AMP:SP:RBV"))) - self.assertEqual(float(amplitude), input_values[device_channel]) + self.assertEqual(float(amplitude), input_values[device_channel]) # pyright: ignore (Inherited from UnitTest) self.ca.assert_that_pv_is( - self.wave_prefixed("AMP:SP:_RAW"), expected_values[device_channel]) + self.wave_prefixed("AMP:SP:_RAW"), expected_values[device_channel] + ) for device_channel in range(NUMBER_OF_CHANNELS): self.ca.set_pv_value("CHANNEL:SP.VAL", device_channel, sleep_after_set=1) self.ca.assert_that_pv_is(self.wave_prefixed("AMP"), expected_values[device_channel]) amplitude = "{:.1f}".format(self.ca.get_pv_value(self.wave_prefixed("AMP:SP:RBV"))) - self.assertEqual(float(amplitude), input_values[device_channel]) - + self.assertEqual(float(amplitude), input_values[device_channel]) # pyright: ignore (Inherited from UnitTest) @skip_if_recsim("RECSIM does not capture dynamic behaviour") def test_WHEN_the_quarter_counter_is_off_THEN_the_number_of_counts_is_and_remains_zero(self):