Bladeren bron

Add test for [include] section with no files= option

Mike Naberezny 10 jaren geleden
bovenliggende
commit
12448b8ca4
1 gewijzigde bestanden met toevoegingen van 24 en 11 verwijderingen
  1. 24 11
      supervisor/tests/test_options.py

+ 24 - 11
supervisor/tests/test_options.py

@@ -927,29 +927,42 @@ class ServerOptionsTests(unittest.TestCase):
         finally:
             shutil.rmtree(dirname)
 
-    def test_readFile_failed(self):
-        from supervisor.options import readFile
+    def test_read_config_include_with_no_files_raises_valueerror(self):
+        instance = self._makeOne()
+        text = lstrip("""\
+        [supervisord]
+
+        [include]
+        ;no files=
+        """)
         try:
-            readFile('/notthere', 0, 10)
-        except ValueError, inst:
-            self.assertEqual(inst.args[0], 'FAILED')
-        else:
-            raise AssertionError("Didn't raise")
+            instance.read_config(StringIO(text))
+            self.fail("nothing raised")
+        except ValueError, exc:
+            self.assertEqual(exc.args[0],
+                ".ini file has [include] section, but no files setting")
 
-    def test_include_with_no_matching_files_logs_warning(self):
+    def test_read_config_include_with_no_matching_files_logs_warning(self):
         instance = self._makeOne()
         text = lstrip("""\
         [supervisord]
-        user=root
 
         [include]
         files=nonexistent/*
         """)
-        instance.configfile = StringIO(text)
-        instance.realize(args=[])
+        instance.read_config(StringIO(text))
         self.assertEqual(instance.parse_warnings,
                          ['No file matches via include "./nonexistent/*"'])
 
+    def test_readFile_failed(self):
+        from supervisor.options import readFile
+        try:
+            readFile('/notthere', 0, 10)
+        except ValueError, inst:
+            self.assertEqual(inst.args[0], 'FAILED')
+        else:
+            raise AssertionError("Didn't raise")
+
     def test_get_pid(self):
         instance = self._makeOne()
         self.assertEqual(os.getpid(), instance.get_pid())