瀏覽代碼

Fix syntax error on Python 2.4

Mike Naberezny 9 年之前
父節點
當前提交
b4938821b5
共有 1 個文件被更改,包括 16 次插入14 次删除
  1. 16 14
      supervisor/tests/test_options.py

+ 16 - 14
supervisor/tests/test_options.py

@@ -800,13 +800,14 @@ class ServerOptionsTests(unittest.TestCase):
         instance = self._makeOne()
         instance = self._makeOne()
         f = tempfile.NamedTemporaryFile(mode="w+")
         f = tempfile.NamedTemporaryFile(mode="w+")
         try:
         try:
-            f.write("[supervisord]\njunk")
-            f.flush()
-            instance.read_config(f.name)
-            self.fail("nothing raised")
-        except ValueError, exc:
-            self.assertTrue(exc.args[0].startswith(
-                'File contains parsing errors: %s' % f.name))
+            try:
+                f.write("[supervisord]\njunk")
+                f.flush()
+                instance.read_config(f.name)
+                self.fail("nothing raised")
+            except ValueError, exc:
+                self.assertTrue(exc.args[0].startswith(
+                    'File contains parsing errors: %s' % f.name))
         finally:
         finally:
             f.close()
             f.close()
 
 
@@ -917,13 +918,14 @@ class ServerOptionsTests(unittest.TestCase):
 
 
         instance = self._makeOne()
         instance = self._makeOne()
         try:
         try:
-            instance.read_config(supervisord_conf)
-            self.fail("nothing raised")
-        except ValueError, exc:
-            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)
+            try:
+                instance.read_config(supervisord_conf)
+                self.fail("nothing raised")
+            except ValueError, exc:
+                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)
         finally:
         finally:
             shutil.rmtree(dirname)
             shutil.rmtree(dirname)