Skip to content

Unbork server_common #8

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

Merged
rerpha merged 1 commit into from
Oct 10, 2025
Merged

Unbork server_common #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ classifiers = [
]

dependencies = [
"pcaspy@git+https://github.com/ISISComputingGroup/pcaspy",
"pcaspy",
"genie-python[plot]",
"CaChannel@git+https://github.com/ISISComputingGroup/CaChannel.git",
"mock",
"parameterized",
"pysnmp",
"PyHamcrest"
"CaChannel",
"mock",
"parameterized",
"pysnmp",
"PyHamcrest"
]

[project.optional-dependencies]
Expand Down
13 changes: 10 additions & 3 deletions src/server_common/test_modules/test_channel_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from concurrent.futures import wait
from queue import Empty, Queue

from hamcrest import *
from hamcrest import assert_that, greater_than, has_length, is_, less_than_or_equal_to, none

from server_common.channel_access import (
NUMBER_OF_CAPUT_THREADS,
Expand All @@ -18,6 +18,13 @@
thread_calls = Queue()


try:
# Changed after CaChannel commit a112650d829138fbf63681772943a547215bdfb6
LOLO_ALARM_STATUS = AlarmStatus.LoLo
except AttributeError:
LOLO_ALARM_STATUS = AlarmStatus.Lolo


def set_pv_value(*args, **kwargs):
"""Mock method with set pv value signature, must take some time to work"""
thread_calls.put((args, kwargs))
Expand Down Expand Up @@ -132,15 +139,15 @@ def test_GIVEN_none_and_minor_WHEN_get_THEN_minor_returned(self):
def test_GIVEN_no_and_minor_major_WHEN_get_THEN_major_returned(self):
no_alarms = (AlarmSeverity.No, AlarmStatus.No)
minor_alarm = (AlarmSeverity.Minor, AlarmStatus.Low)
major_alarm = (AlarmSeverity.Major, AlarmStatus.Lolo)
major_alarm = (AlarmSeverity.Major, LOLO_ALARM_STATUS)
result = maximum_severity(minor_alarm, major_alarm, no_alarms)

assert_that(result, is_(major_alarm))

def test_GIVEN_no_minor_major_and_invalid_WHEN_get_THEN_invalid_returned(self):
no_alarms = (AlarmSeverity.No, AlarmStatus.No)
minor_alarm = (AlarmSeverity.Minor, AlarmStatus.Low)
major_alarm = (AlarmSeverity.Major, AlarmStatus.Lolo)
major_alarm = (AlarmSeverity.Major, LOLO_ALARM_STATUS)
invalid_alarm = (AlarmSeverity.Invalid, AlarmStatus.Timeout)
result = maximum_severity(minor_alarm, invalid_alarm, major_alarm, no_alarms)

Expand Down