From d0f89c96bb45b82f1e8eff63ce7c65cb79956985 Mon Sep 17 00:00:00 2001 From: Aaron Whitehouse Date: Thu, 17 Mar 2022 22:31:15 +0000 Subject: [PATCH] Fix monitoring test after sanoid run --- tests/0_monitoring_tests/test_monitoring.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/0_monitoring_tests/test_monitoring.py b/tests/0_monitoring_tests/test_monitoring.py index 863a5b1..47263e3 100644 --- a/tests/0_monitoring_tests/test_monitoring.py +++ b/tests/0_monitoring_tests/test_monitoring.py @@ -66,12 +66,9 @@ class TestsWithZpool(unittest.TestCase): # Run sanoid and test again run_sanoid_cron_command() return_info = monitor_snapshots_command() - self.assertEqual(return_info.stdout, b"CRIT: sanoid-test-1 has no daily snapshots at all!, CRIT: sanoid-test-1 has no hourly snapshots at all!, CRIT: sanoid-test-1 has no monthly snapshots at all!, CRIT: sanoid-test-2 has no daily snapshots at all!, CRIT: sanoid-test-2 has no hourly snapshots at all!, CRIT: sanoid-test-2 has no monthly snapshots at all!\n") + self.assertEqual(return_info.stdout, b"OK: all monitored datasets (sanoid-test-1, sanoid-test-2) have fresh snapshots\n") self.assertEqual(return_info.returncode, 2) - # return_info = monitor_snapshots_command() - # self.assertEqual(return_info.stdout, b"CRIT: sanoid-test-1 has no daily snapshots at all!, CRIT: sanoid-test-1 has no hourly snapshots at all!, CRIT: sanoid-test-1 has no monthly snapshots at all!, CRIT: sanoid-test-2 has no daily snapshots at all!, CRIT: sanoid-test-2 has no hourly snapshots at all!, CRIT: sanoid-test-2 has no monthly snapshots at all!\n") - if __name__ == '__main__': unittest.main()