fix: test threshold simplication

Author: itkovian

test/nagios.py

@@ -68,8 +68,6 @@ def test_eval(self):
 
     def test_cache(self):
         """Test the caching mechanism in the reporter."""
-        length = random.randint(1, 30)
-
         message = "huppeldepup a test string"
 
         threshold = None
@@ -107,7 +105,7 @@ def test_cache(self):
     def test_threshold(self, message="Hello"):
         """Test the threshold borking mechanism in the reporter."""
         message = message.rstrip()
-        threshold = 1
+        threshold = 2
         if message == '':
             return
 
@@ -123,8 +121,8 @@ def test_threshold(self, message="Hello"):
         reporter.cache(nagios_exit, message)
 
         raised_exception = None
+        reporter_test = NagiosReporter('test_cache', filename, threshold, self.nagios_user)
         try:
-            reporter_test = NagiosReporter('test_cache', filename, threshold, self.nagios_user)
             reporter_test.report_and_exit()
         except SystemExit as err:
             raised_exception = err
@@ -133,19 +131,10 @@ def test_threshold(self, message="Hello"):
         # restore stdout
         buff.close()
 
-        sys.stdout = old_stdout
-
-        reporter = NagiosReporter('test_cache', filename, threshold, self.nagios_user)
-        reporter.cache(nagios_exit, message)
         time.sleep(threshold + 1)
-        # redirect stdout
-        old_stdout = sys.stdout
         buff = StringIO()
-        sys.stdout = buff
-
         raised_exception = None
         try:
-            reporter_test = NagiosReporter('test_cache', filename, threshold, self.nagios_user)
             reporter_test.report_and_exit()
         except SystemExit as err:
             raised_exception = err
@@ -156,8 +145,7 @@ def test_threshold(self, message="Hello"):
         sys.stdout = old_stdout
         self.assertEqual(raised_exception.code, NAGIOS_EXIT_UNKNOWN[0],
                          "Too old caches lead to unknown status")
-        self.assertTrue(line.startswith("%s test_cache gzipped JSON file too old (timestamp =" %
-                                        (NAGIOS_EXIT_UNKNOWN[1])))
+        self.assertTrue(line.startswith("%s test_cache nagios exit info expired" % (NAGIOS_EXIT_UNKNOWN[1])))
 
         shutil.rmtree(filename)