Changeset 209 for pyyaml/trunk/tests

Timestamp:

07/21/06 09:52:03 (6 years ago)

Author:

xi

Message:

Update libyaml bindings.

Files:

• pyyaml/trunk/tests/test_yaml_ext.py (modified) (2 diffs)

pyyaml/trunk/tests/test_yaml_ext.py

@@ -11 +11 @@
 class TestExtLoader(test_appliance.TestAppliance):
 
-    def _testExtScanner(self, test_name, data_filename, canonical_filename):
-        data = file(data_filename, 'r').read()
+    def _testExtScannerFileInput(self, test_name, data_filename, canonical_filename):
+        self._testExtScanner(test_name, data_filename, canonical_filename, True)
+
+    def _testExtScanner(self, test_name, data_filename, canonical_filename, file_input=False):
+        if file_input:
+            data = file(data_filename, 'r')
+        else:
+            data = file(data_filename, 'r').read()
         tokens = list(yaml.scan(data))
         ext_tokens = []
         try:
+            if file_input:
+                data = file(data_filename, 'r')
             for token in yaml.scan(data, Loader=yaml.ExtLoader):
                 ext_tokens.append(token)
@@ -63 +71 @@
 
 TestExtLoader.add_tests('testExtScanner', '.data', '.canonical')
+TestExtLoader.add_tests('testExtScannerFileInput', '.data', '.canonical')
 TestExtLoader.add_tests('testExtParser', '.data', '.canonical')