Skip to content

Sensormond stop signal logic - incorrect short circuit #662

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Sensormond stop signal logic - incorrect short circuit #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cafa82b
incorrect logic, needs to be and to check current if voltage is okay
gregoryboudreau Aug 15, 2025
9282c73
Merge branch 'sonic-net:master' into sensormond-bug-faulty-stopevent-…
gregoryboudreau Sep 2, 2025
4df591d
adding logical checks to unit tests to check case
gregoryboudreau Sep 8, 2025
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
2 changes: 1 addition & 1 deletion sonic-sensormond/scripts/sensormond
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ class SensorMonitorDaemon(daemon_base.DaemonBase):

begin = time.time()

if not (self.voltage_updater.update(self.stop_event) or self.current_updater.update(self.stop_event)):
if not (self.voltage_updater.update(self.stop_event) and self.current_updater.update(self.stop_event)):
# Fatal signal received in the process of reading voltage or current sensors
return False

Expand Down
10 changes: 10 additions & 0 deletions sonic-sensormond/tests/test_sensormond.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,16 @@ def get_chassis(self):
daemon.voltage_updater.update = mock.MagicMock(return_value=False)
daemon.current_updater.update = mock.MagicMock(return_value=True)
ret = daemon.run()
assert ret is False

daemon.voltage_updater.update = mock.MagicMock(return_value=True)
daemon.current_updater.update = mock.MagicMock(return_value=False)
ret = daemon.run()
assert ret is False

daemon.voltage_updater.update = mock.MagicMock(return_value=True)
daemon.current_updater.update = mock.MagicMock(return_value=True)
ret = daemon.run()
assert ret is True

def test_try_get():
Expand Down
Loading