浏览代码

Fix tests broken by change in log level

Mike Naberezny 10 年之前
父节点
当前提交
4e1f60c478
共有 1 个文件被更改,包括 20 次插入4 次删除
  1. 20 4
      supervisor/tests/test_options.py

+ 20 - 4
supervisor/tests/test_options.py

@@ -747,6 +747,22 @@ class ServerOptionsTests(unittest.TestCase):
         instance.realize(args=[])
         self.assertFalse(old_warning in instance.parse_warnings)
 
+    def test_reload_clears_parse_infos(self):
+        instance = self._makeOne()
+        old_info = "Info from a prior config read"
+        instance.infos = [old_info]
+
+        text = lstrip("""\
+        [supervisord]
+        user=root
+
+        [program:cat]
+        command = /bin/cat
+        """)
+        instance.configfile = StringIO(text)
+        instance.realize(args=[])
+        self.assertFalse(old_info in instance.parse_infos)
+
     def test_read_config_not_found(self):
         nonexistent = os.path.join(os.path.dirname(__file__), 'nonexistent')
         instance = self._makeOne()
@@ -846,9 +862,9 @@ class ServerOptionsTests(unittest.TestCase):
             options = instance.configroot.supervisord
             self.assertEqual(len(options.server_configs), 2)
             msg = 'Included extra file "%s" during parsing' % conf_file
-            self.assertTrue(msg in instance.parse_warnings)
+            self.assertTrue(msg in instance.parse_infos)
             msg = 'Included extra file "%s" during parsing' % ini_file
-            self.assertTrue(msg in instance.parse_warnings)
+            self.assertTrue(msg in instance.parse_infos)
         finally:
             shutil.rmtree(dirname)
 
@@ -883,7 +899,7 @@ class ServerOptionsTests(unittest.TestCase):
                 filename = os.path.join(conf_d, "%s.conf" % letter)
                 expected_msgs.append(
                     'Included extra file "%s" during parsing' % filename)
-            self.assertEqual(instance.parse_warnings, expected_msgs)
+            self.assertEqual(instance.parse_infos, expected_msgs)
         finally:
             shutil.rmtree(dirname)
 
@@ -914,7 +930,7 @@ class ServerOptionsTests(unittest.TestCase):
             self.assertTrue('contains parsing errors:' in exc.args[0])
             self.assertTrue(malformed_file in exc.args[0])
             msg = 'Included extra file "%s" during parsing' % malformed_file
-            self.assertTrue(msg in instance.parse_warnings)
+            self.assertTrue(msg in instance.parse_infos)
         finally:
             shutil.rmtree(dirname)