Fix tests using complex print to run under python3.

Separation is needed, because print is a statement in python3.
zopefoundation · Jun 8, 2017 · 1a8ab38 · 1a8ab38
1 parent bf149dc
commit 1a8ab38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/Products/PythonScripts/tests/testPythonScript.py b/src/Products/PythonScripts/tests/testPythonScript.py
@@ -12,6 +12,7 @@
 ##############################################################################
 import os
 import six
+import sys
 import unittest
 import warnings
 
@@ -203,7 +204,8 @@ def testSimplePrint(self):
         self.assertEqual(res, 'a\n')
 
     def testComplexPrint(self):
-        res = self._filePS('complex_print')()
+        script = 'complex_print_py%s' % sys.version_info.major
+        res = self._filePS(script)()
         self.assertEqual(res, 'double\ndouble\nx: 1\ny: 0 1 2\n\n')
 
     def testNSBind(self):
@@ -219,7 +221,8 @@ def testBooleanMap(self):
         self.failUnless(res)
 
     def testGetSize(self):
-        f = self._filePS('complex_print')
+        script = 'complex_print_py%s' % sys.version_info.major
+        f = self._filePS(script)
         self.assertEqual(f.get_size(), len(f.read()))
 
     def testBuiltinSet(self):

diff --git a/...onScripts/tests/tscripts/complex_print.ps → ...ripts/tests/tscripts/complex_print_py2.ps b/...onScripts/tests/tscripts/complex_print.ps → ...ripts/tests/tscripts/complex_print_py2.ps
diff --git a/src/Products/PythonScripts/tests/tscripts/complex_print_py3.ps b/src/Products/PythonScripts/tests/tscripts/complex_print_py3.ps