Skip to content

Commit b098cf8

Browse files
committed
Dev: unittests: Adjust unit test for previous commit
1 parent cf8bf56 commit b098cf8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

test/unittests/test_ui_sbd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def test_configure_usage_disk_diskbased(self, mock_is_using_disk_based_sbd, mock
155155
mock_is_using_disk_based_sbd.return_value = True
156156
timeout_usage_str = " ".join([f"[{t}-timeout=<integer>]" for t in ui_sbd.SBD.TIMEOUT_TYPES])
157157
show_usage = f"crm sbd configure show [{'|'.join(ui_sbd.SBD.SHOW_TYPES)}]"
158-
expected = f"Usage:\n{show_usage}\ncrm sbd configure {timeout_usage_str} [watchdog-device=<device>]\n"
158+
expected = f"Usage:\n{show_usage}\ncrm sbd configure {timeout_usage_str} [watchdog-device=<device|driver>]\n"
159159
self.assertEqual(self.sbd_instance_diskbased.configure_usage, expected)
160160
mock_is_using_disk_based_sbd.assert_called_once()
161161
mock_is_using_diskless_sbd.assert_not_called()
@@ -167,7 +167,7 @@ def test_configure_usage_disk_diskless(self, mock_is_using_disk_based_sbd, mock_
167167
mock_is_using_diskless_sbd.return_value = True
168168
timeout_usage_str = " ".join([f"[{t}-timeout=<integer>]" for t in ui_sbd.SBD.DISKLESS_TIMEOUT_TYPES])
169169
show_usage = f"crm sbd configure show [{'|'.join(ui_sbd.SBD.DISKLESS_SHOW_TYPES)}]"
170-
expected = f"Usage:\n{show_usage}\ncrm sbd configure {timeout_usage_str} [watchdog-device=<device>]\n"
170+
expected = f"Usage:\n{show_usage}\ncrm sbd configure {timeout_usage_str} [watchdog-device=<device|driver>]\n"
171171
self.assertEqual(self.sbd_instance_diskless.configure_usage, expected)
172172
mock_is_using_disk_based_sbd.assert_called_once()
173173
mock_is_using_diskless_sbd.assert_called_once()

test/unittests/test_watchdog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ def test_init_watchdog_error(self, mock_set_info, mock_set_input, mock_valid, mo
287287

288288
mock_valid.assert_called_once_with("test")
289289
mock_run.assert_called_once_with("modinfo test")
290-
mock_error.assert_called_once_with("Should provide valid watchdog device or driver name by -w option")
290+
mock_error.assert_called_once_with("Should provide valid watchdog device or driver name")
291291

292292
@mock.patch('crmsh.watchdog.Watchdog._get_device_through_driver')
293293
@mock.patch('crmsh.watchdog.Watchdog._load_watchdog_driver')

0 commit comments

Comments
 (0)