Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 5 additions & 9 deletions src/contraqctor/qc/harp/harp_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,18 +235,14 @@ def test_fw_version_matches_reader(self):
return self.fail_test(
None, f"Firmware version is not a valid semver version. Expected {fw} and got {device_fw}"
)
if fw > device_fw:
return self.fail_test(
False,
f"Expected version {fw} is greater than the device's version {device_fw}. Consider updating the device firmware.",
)
elif fw == device_fw:
return self.pass_test(True, f"Expected version {fw} matches the device's version {device_fw}")
else:

if fw != device_fw:
return self.warn_test(
False,
f"Expected version {fw} is less than the device's version {device_fw}. Consider updating interface package.",
f"Expected version {fw} does not match the device's version {device_fw}. Consider updating the device firmware or interface package.",
)
else:
return self.pass_test(True, f"Expected version {fw} matches the device's version {device_fw}")

def test_core_version(self):
"""Check if the core version of the device matches the one provided"""
Expand Down
5 changes: 1 addition & 4 deletions tests/test_qc/harp/test_harp.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,18 +357,15 @@ def test_fw_version_matches_reader(self, mock_harp_device):

mock_harp_device.device_reader.device.firmwareVersion = "1.3.0"
result = suite.test_fw_version_matches_reader()
assert result.status == Status.FAILED
assert "Consider updating the device firmware" in result.message
assert result.status == Status.WARNING

mock_harp_device.device_reader.device.firmwareVersion = "1.1.0"
result = suite.test_fw_version_matches_reader()
assert result.status == Status.WARNING
assert "Consider updating interface package" in result.message

mock_harp_device.device_reader.device.firmwareVersion = "invalid"
result = suite.test_fw_version_matches_reader()
assert result.status == Status.FAILED
assert "not a valid semver version" in result.message

def test_core_version(self, mock_harp_device):
"""Test test_core_version method."""
Expand Down
Loading