Changeset 311

Timestamp:

12/27/08 09:54:07 (4 years ago)

Author:

xi

Message:

Minor fixes in the test subsystem to prevent failures in LibYAML bindings tests.

Location:

pyyaml/trunk/tests

Files:

• test_build.py (modified) (1 diff)
• test_yaml_ext.py (modified) (1 diff)

pyyaml/trunk/tests/test_build.py

@@ -2 +2 @@
 def main():
     import sys, os, distutils.util
-    #build_lib = os.path.join('build', 'lib.%s-%s' % (distutils.util.get_platform(), sys.version[0:3]))
     build_lib = 'build/lib'
+    build_lib_ext = os.path.join('build', 'lib.%s-%s' % (distutils.util.get_platform(), sys.version[0:3]))
     sys.path.insert(0, build_lib)
+    sys.path.insert(0, build_lib_ext)
     import test_yaml
     test_yaml.main('test_yaml')

pyyaml/trunk/tests/test_yaml_ext.py

@@ -29 +29 @@
             for token, ext_token in zip(tokens, ext_tokens):
                 self.failUnlessEqual(token.__class__, ext_token.__class__)
-                self.failUnlessEqual((token.start_mark.index, token.start_mark.line, token.start_mark.column),
-                        (ext_token.start_mark.index, ext_token.start_mark.line, ext_token.start_mark.column))
-                self.failUnlessEqual((token.end_mark.index, token.end_mark.line, token.end_mark.column),
-                        (ext_token.end_mark.index, ext_token.end_mark.line, ext_token.end_mark.column))
+                if not isinstance(token, yaml.StreamEndToken):
+                    self.failUnlessEqual((token.start_mark.index, token.start_mark.line, token.start_mark.column),
+                            (ext_token.start_mark.index, ext_token.start_mark.line, ext_token.start_mark.column))
+                    self.failUnlessEqual((token.end_mark.index, token.end_mark.line, token.end_mark.column),
+                            (ext_token.end_mark.index, ext_token.end_mark.line, ext_token.end_mark.column))
                 if hasattr(token, 'value'):
                     self.failUnlessEqual(token.value, ext_token.value)