Merge pull request #172 from patacrep/invalid_source

Parsing hangs when file is inconsistent

patacrep/files.py

@@ -62,17 +62,17 @@ def path2posix(string):
         )
 
 @contextmanager
-def chdir(path):
+def chdir(*path):
     """Locally change dir
 
     Can be used as:
 
-        with chdir("some/directory"):
+        with chdir("some", "directory"):
             do_stuff()
     """
     olddir = os.getcwd()
     if path:
-        os.chdir(path)
+        os.chdir(os.path.join(*path))
         yield
         os.chdir(olddir)
     else:

patacrep/songs/chordpro/syntax.py

@@ -307,12 +307,17 @@ class ChordproParser(Parser):
             token = self.parser.token()
             if not token or token.type == "ENDOFLINE":
                 break
-        self.parser.errok()
+        if token:
+            self.parser.errok()
         return token
 
 def parse_song(content, filename=None):
     """Parse song and return its metadata."""
-    return ChordproParser(filename).parse(
+    parser = ChordproParser(filename)
+    parsed_content = parser.parse(
         content,
         lexer=ChordProLexer(filename=filename).lexer,
         )
+    if parsed_content is None:
+        raise SyntaxError('Fatal error during song parsing: {}'.format(filename))
+    return parsed_content

test/test_chordpro/errors/invalid_content.source

@@ -0,0 +1,3 @@
+{soc}
+Chorus
+{eoc

test/test_chordpro/test_parser.py

@@ -44,13 +44,11 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest):
 
     @staticmethod
     @contextlib.contextmanager
-    def chdir():
+    def chdir(*path):
-        """Context to temporarry change current directory to this file directory
+        """Context to temporarry change current directory, relative to this file directory
         """
-        olddir = os.getcwd()
+        with files.chdir(resource_filename(__name__, ""), *path):
-        os.chdir(resource_filename(__name__, ""))
+            yield
-        yield
-        os.chdir(olddir)
 
     def assertRender(self, base, destformat): # pylint: disable=invalid-name
         """Assert that `{base}.source` is correctly rendered in the `destformat`.
@@ -92,22 +90,41 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest):
                         cls._create_test(base, dest),
                         )
 
+            with cls.chdir('errors'):
+                for source in sorted(glob.glob('*.source')):
+                    base = source[:-len(".source")]
+                    yield (
+                        "test_{}_failure".format(base),
+                        cls._create_failure(base),
+                        )
+
     @classmethod
     def _create_test(cls, base, dest):
         """Return a function testing that `base` compilation in `dest` format.
         """
-
+        test_parse_render = lambda self: self.assertRender(base, dest)
-        def test_parse_render(self):
-            """Test that `base` is correctly parsed and rendered."""
-            if base is None or dest is None:
-                return
-            self.assertRender(base, dest)
-
         test_parse_render.__doc__ = (
             "Test that '{base}' is correctly parsed and rendererd into '{format}' format."
             ).format(base=os.path.basename(base), format=dest)
         return test_parse_render
 
+    @classmethod
+    def _create_failure(cls, base):
+        """Return a function testing that `base` parsing fails.
+        """
+
+        def test_parse_failure(self):
+            """Test that `base` parsing fails."""
+            sourcename = "{}.source".format(base)
+            with self.chdir('errors'):
+                parser = self.song_plugins[LANGUAGES['sgc']]['sgc']
+                self.assertRaises(SyntaxError, parser, sourcename, self.config)
+
+        test_parse_failure.__doc__ = (
+            "Test that '{base}' parsing fails."
+            ).format(base=os.path.basename(base))
+        return test_parse_failure
+
     @classmethod
     def _overwrite_clrf(cls):
         """Overwrite `*.crlf.source` files to force the CRLF line endings.