diff options
| author | xi <xi@18f92427-320e-0410-9341-c67f048884a3> | 2008-12-27 14:54:07 +0000 |
|---|---|---|
| committer | xi <xi@18f92427-320e-0410-9341-c67f048884a3> | 2008-12-27 14:54:07 +0000 |
| commit | 17f23eaa6ae4fecdacb1950f2ba4462a7ae79e9c (patch) | |
| tree | 3198e510d08409b37450da1c78118d2cb82bc9bb | |
| parent | cbed7e4b07ed484326917f990f0d3912927474e3 (diff) | |
| download | pyyaml-17f23eaa6ae4fecdacb1950f2ba4462a7ae79e9c.tar.gz | |
Minor fixes in the test subsystem to prevent failures in LibYAML bindings tests.
git-svn-id: http://svn.pyyaml.org/pyyaml/trunk@311 18f92427-320e-0410-9341-c67f048884a3
| -rw-r--r-- | tests/test_build.py | 3 | ||||
| -rw-r--r-- | tests/test_yaml_ext.py | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/test_build.py b/tests/test_build.py index 50f7437..42afa78 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -1,9 +1,10 @@ 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') diff --git a/tests/test_yaml_ext.py b/tests/test_yaml_ext.py index c5dd036..ea3263b 100644 --- a/tests/test_yaml_ext.py +++ b/tests/test_yaml_ext.py @@ -28,10 +28,11 @@ class TestCLoader(test_appliance.TestAppliance): 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: |