Kirill Simonov avatar Kirill Simonov committed 663e1b7

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

Comments (0)

Files changed (2)

tests/test_build.py

 
 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')
 

tests/test_yaml_ext.py

             self.failUnlessEqual(len(tokens), len(ext_tokens))
             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)
         except:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.