Changeset 258 for pyyaml/trunk/tests

Timestamp:

08/21/07 16:25:34 (5 years ago)

Author:

xi

Message:

Make compose() and load() ensure that the input stream contains a single document. Fixes #54.

Location:

pyyaml/trunk/tests

Files:

• data/empty-documents.single-loader-error (added)
• data/explicit-document.single-loader-error (added)
• data/implicit-document.single-loader-error (added)
• test_errors.py (modified) (2 diffs)

pyyaml/trunk/tests/test_errors.py

@@ -16 +16 @@
         #self._load_string(invalid_filename)
         self.failUnlessRaises(YAMLError, lambda: self._load_string(invalid_filename))
+
+    def _testLoaderSingleErrors(self, test_name, invalid_filename):
+        self._load_single(invalid_filename)
+        self.failUnlessRaises(YAMLError, lambda: self._load_single(invalid_filename))
 
     def _testEmitterErrors(self, test_name, invalid_filename):
@@ -67 +71 @@
             raise
 
+    def _load_single(self, filename):
+        try:
+            return load(file(filename, 'rb').read())
+        except YAMLError, exc:
+        #except ScannerError, exc:
+        #except ParserError, exc:
+        #except ComposerError, exc:
+        #except ConstructorError, exc:
+            #print '.'*70
+            #print "%s:" % filename
+            #print "%s:" % exc.__class__.__name__, exc
+            raise
+
 TestErrors.add_tests('testLoaderErrors', '.loader-error')
 TestErrors.add_tests('testLoaderStringErrors', '.loader-error')
+TestErrors.add_tests('testLoaderSingleErrors', '.single-loader-error')
 TestErrors.add_tests('testEmitterErrors', '.emitter-error')
 TestErrors.add_tests('testDumperErrors', '.dumper-error')