Share data files between Py2 and Py3 test suites.

MANIFEST.in

@@ -1,4 +1,5 @@
 include README LICENSE CHANGES setup.py
 recursive-include examples *.py *.cfg *.yaml
-recursive-include tests *.py
 recursive-include tests/data *
+recursive-include tests/lib *.py
+recursive-include tests/lib3 *.py

Makefile

@@ -24,10 +24,10 @@ installext:
 	${PYTHON} setup.py --with-libyaml install ${PARAMETERS}
 
 test: build
-	${PYTHON} tests/test_build.py ${TEST}
+	${PYTHON} tests/lib/test_build.py ${TEST}
 
 testext: buildext
-	${PYTHON} tests/test_build_ext.py ${TEST}
+	${PYTHON} tests/lib/test_build_ext.py ${TEST}
 
 testall:
 	${PYTHON} setup.py test

setup.py

@@ -288,9 +288,9 @@ def run(self):
         build_cmd.run()
         sys.path.insert(0, build_cmd.build_lib)
         if sys.version_info[0] < 3:
-            sys.path.insert(0, 'tests')
+            sys.path.insert(0, 'tests/lib')
         else:
-            sys.path.insert(0, 'tests3')
+            sys.path.insert(0, 'tests/lib3')
         import test_all
         test_all.main([])
 

tests/data/construct-python-name-module.code

@@ -1 +1 @@
-[file, yaml.Loader, yaml.dump, abs, yaml.tokens]
+[str, yaml.Loader, yaml.dump, abs, yaml.tokens]

tests/data/construct-python-name-module.data

@@ -1,4 +1,4 @@
-- !!python/name:file
+- !!python/name:str
 - !!python/name:yaml.Loader
 - !!python/name:yaml.dump
 - !!python/name:abs

tests/data/serializer-is-already-opened.dumper-error

@@ -1,3 +1,3 @@
-dumper = yaml.Dumper(StringIO.StringIO())
+dumper = yaml.Dumper(StringIO())
 dumper.open()
 dumper.open()

tests/data/serializer-is-closed-1.dumper-error

@@ -1,4 +1,4 @@
-dumper = yaml.Dumper(StringIO.StringIO())
+dumper = yaml.Dumper(StringIO())
 dumper.open()
 dumper.close()
 dumper.open()

tests/data/serializer-is-closed-2.dumper-error

@@ -1,4 +1,4 @@
-dumper = yaml.Dumper(StringIO.StringIO())
+dumper = yaml.Dumper(StringIO())
 dumper.open()
 dumper.close()
 dumper.serialize(yaml.ScalarNode(tag='!foo', value='bar'))

tests/data/serializer-is-not-opened-1.dumper-error

@@ -1,2 +1,2 @@
-dumper = yaml.Dumper(StringIO.StringIO())
+dumper = yaml.Dumper(StringIO())
 dumper.close()

tests/data/serializer-is-not-opened-2.dumper-error

@@ -1,2 +1,2 @@
-dumper = yaml.Dumper(StringIO.StringIO())
+dumper = yaml.Dumper(StringIO())
 dumper.serialize(yaml.ScalarNode(tag='!foo', value='bar'))

tests/test_appliance.py → tests/lib/test_appliance.py

@@ -23,6 +23,8 @@ def find_test_filenames(directory):
     for filename in os.listdir(directory):
         if os.path.isfile(os.path.join(directory, filename)):
             base, ext = os.path.splitext(filename)
+            if base.endswith('-py3'):
+                continue
             filenames.setdefault(base, []).append(ext)
     filenames = filenames.items()
     filenames.sort()

tests/test_errors.py → tests/lib/test_errors.py

@@ -50,7 +50,8 @@ def test_emitter_error(error_filename, verbose=False):
 def test_dumper_error(error_filename, verbose=False):
     code = open(error_filename, 'rb').read()
     try:
-        import yaml, StringIO
+        import yaml
+        from StringIO import StringIO
         exec code
     except yaml.YAMLError, exc:
         if verbose:

tests3/test_appliance.py → tests/lib3/test_appliance.py

@@ -1,7 +1,7 @@
 
 import sys, os, os.path, types, traceback, pprint
 
-DATA = 'tests3/data'
+DATA = 'tests/data'
 
 def find_test_functions(collections):
     if not isinstance(collections, list):
@@ -21,6 +21,8 @@ def find_test_filenames(directory):
     for filename in os.listdir(directory):
         if os.path.isfile(os.path.join(directory, filename)):
             base, ext = os.path.splitext(filename)
+            if base.endswith('-py2'):
+                continue
             filenames.setdefault(base, []).append(ext)
     filenames = sorted(filenames.items())
     return filenames

tests3/test_constructor.py → tests/lib3/test_constructor.py

@@ -12,8 +12,9 @@ def execute(code):
 
 def _make_objects():
     global MyLoader, MyDumper, MyTestClass1, MyTestClass2, MyTestClass3, YAMLObject1, YAMLObject2,  \
-            AnObject, AnInstance, AState, ACustomState, NewArgs, NewArgsWithState,  \
-            Reduce, ReduceWithState, MyInt, MyList, MyDict, FixedOffset, execute
+            AnObject, AnInstance, AState, ACustomState, InitArgs, InitArgsWithState,    \
+            NewArgs, NewArgsWithState, Reduce, ReduceWithState, MyInt, MyList, MyDict,  \
+            FixedOffset, execute
 
     class MyLoader(yaml.Loader):
         pass
@@ -157,6 +158,10 @@ def __getstate__(self):
         def __setstate__(self, state):
             self.baz = state
 
+    InitArgs = NewArgs
+
+    InitArgsWithState = NewArgsWithState
+
     class Reduce(AnObject):
         def __reduce__(self):
             return self.__class__, (self.foo, self.bar, self.baz)

tests3/test_errors.py → tests/lib3/test_errors.py

@@ -50,7 +50,8 @@ def test_emitter_error(error_filename, verbose=False):
 def test_dumper_error(error_filename, verbose=False):
     code = open(error_filename, 'rb').read()
     try:
-        import yaml, io
+        import yaml
+        from io import StringIO
         exec(code)
     except yaml.YAMLError as exc:
         if verbose: