Merge pull request #673 from t-b/switch-to-python3-for-tests

Switch to python3 for tests

Author: t-b

.travis/debian10/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y \
   libzmq3-dev                            \
   lsb-release                            \
   omniidl                                \
-  python2
+  python3
 
 RUN apt-get install -y \
     apt-transport-https \

.travis/debian8/Dockerfile

@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y \
   libcos4-dev                            \
   libomnithread3-dev                     \
   libzmq3-dev                            \
+  python3                                \
   wget
 
 RUN wget --no-check-certificate https://cmake.org/files/v3.10/cmake-3.10.0-Linux-x86_64.sh -O /tmp/cmake-install.sh \

.travis/debian9/Dockerfile

@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y \
   libomniorb4-dev                        \
   libcos4-dev                            \
   libomnithread3-dev                     \
+  python3                                \
   libzmq3-dev
 
 RUN apt-get install -y \

.travis/gcc-latest/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y \
   libzmq3-dev                            \
   lsb-release                            \
   omniidl                                \
-  python2
+  python3
 
 RUN groupadd -g "$APP_GID" tango
 

.travis/llvm-latest/Dockerfile

@@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y \
   libzmq3-dev                            \
   lsb-release                            \
   omniidl                                \
-  python2
+  python3
 
 RUN curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - &&                                                  \
     echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-${LLVM_VERSION} main" | tee -a /etc/apt/sources.list && \

.travis/ubuntu-20.04/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y \
   libzmq3-dev                            \
   lsb-release                            \
   omniidl                                \
-  python2                                \
+  python3                                \
   docker.io
 
 RUN groupadd -g "$APP_GID" tango

cpp_test_suite/build_runner.bat

@@ -1,5 +1,5 @@
 set REL_DIR=..\..\..\..\
-python %REL_DIR%cxxtest\bin\cxxtestgen.py --template=%REL_DIR%cxxtest\template\tango_template.tpl -o runner.cpp ^
+python3 %REL_DIR%cxxtest\bin\cxxtestgen.py --template=%REL_DIR%cxxtest\template\tango_template.tpl -o runner.cpp ^
 %REL_DIR%new_tests\cxx_syntax.cpp ^
 %REL_DIR%new_tests\cxx_poll.cpp ^
 %REL_DIR%new_tests\cxx_poll_admin.cpp ^
@@ -29,7 +29,7 @@ python %REL_DIR%cxxtest\bin\cxxtestgen.py --template=%REL_DIR%cxxtest\template\t
 %REL_DIR%new_tests\cxx_fwd_att.cpp ^
 %REL_DIR%new_tests\cxx_pipe_conf.cpp ^
 %REL_DIR%new_tests\cxx_pipe.cpp ^
-%REL_DIR%new_tests\cxx_z00_dyn_cmd.cpp 
+%REL_DIR%new_tests\cxx_z00_dyn_cmd.cpp
 
 rem %REL_DIR%new_tests\cxx_zmcast01_simple.cpp ^
 rem %REL_DIR%new_tests\cxx_zmcast02_local_remote.cpp ^

cpp_test_suite/cxxtest/CMakeLists.txt

@@ -1,8 +1,8 @@
 find_package (Threads REQUIRED)
-find_program(PYTHON_INTERPRETER NAMES python2 python)
+find_program(PYTHON_INTERPRETER NAMES python3)
 
 if(NOT PYTHON_INTERPRETER)
-  message(SEND_ERROR "Could not find python 2.")
+  message(FATAL_ERROR "Could not find python 3.")
 endif()
 
 macro(CXX_GENERATE_TEST name)
@@ -16,7 +16,7 @@ macro(CXX_GENERATE_TEST name)
         RESULT_VARIABLE GENERATOR_OUTPUT)
 
     if(NOT EXISTS ${GENERATED_FILE})
-      message(SEND_ERROR " Failed to generate ${name}.cpp due to \"${GENERATOR_OUTPUT}\".")
+      message(FATAL_ERROR " Failed to generate ${name}.cpp due to \"${GENERATOR_OUTPUT}\".")
     endif()
 
     add_executable(${name} $<TARGET_OBJECTS:compare_test_object> ${name}.cpp)

cpp_test_suite/cxxtest/bin/cxxtestgen.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 '''Usage: %s [OPTIONS] <input file(s)>
 Generate test source file for CxxTest.
 
@@ -57,7 +57,7 @@ def main():
 def usage( problem = None ):
     '''Print usage info and exit'''
     if problem is None:
-        print usageString()
+        print(usageString())
         sys.exit(0)
     else:
         sys.stderr.write( usageString() )
@@ -82,7 +82,7 @@ def parseCommandline():
                                             'error-printer', 'abort-on-fail', 'have-std', 'no-std',
                                             'have-eh', 'no-eh', 'template=', 'include=',
                                             'root', 'part', 'no-static-init', 'factor', 'longlong='] )
-    except getopt.error, problem:
+    except getopt.error as problem:
         usage( problem )
     setOptions( options )
     return setFiles( patterns )
@@ -147,7 +147,7 @@ def printVersion():
 def setFiles( patterns ):
     '''Set input files specified on command line'''
     files = expandWildcards( patterns )
-    if len(files) is 0 and not root:
+    if len(files) == 0 and not root:
         usage( "No input files found" )
     return files
 
@@ -169,7 +169,7 @@ def scanInputFiles(files):
     for file in files:
         scanInputFile(file)
     global suites
-    if len(suites) is 0 and not root:
+    if len(suites) == 0 and not root:
         abort( 'No tests defined' )
 
 def scanInputFile(fileName):
@@ -288,7 +288,7 @@ def addLineToBlock( suite, lineNo, line ):
     '''Append the line to the current CXXTEST_CODE() block'''
     line = fixBlockLine( suite, lineNo, line )
     line = re.sub( r'^.*\{\{', '', line )
-    
+
     e = re.search( r'\}\}', line )
     if e:
         line = line[:e.start()]
@@ -315,30 +315,30 @@ def scanLineForDestroy( suite, lineNo, line ):
 
 def cstr( str ):
     '''Convert a string to its C representation'''
-    return '"' + string.replace( str, '\\', '\\\\' ) + '"'
+    return '"' + str.replace('\\', '\\\\' ) + '"'
 
 
 def addSuiteCreateDestroy( suite, which, line ):
     '''Add createSuite()/destroySuite() to current suite'''
-    if suite.has_key(which):
+    if which in suite:
         abort( '%s:%s: %sSuite() already declared' % ( suite['file'], str(line), which ) )
     suite[which] = line
 
 def closeSuite():
     '''Close current suite and add it to the list if valid'''
     global suite
     if suite is not None:
-        if len(suite['tests']) is not 0:
+        if len(suite['tests']) != 0:
             verifySuite(suite)
             rememberSuite(suite)
         suite = None
 
 def verifySuite(suite):
     '''Verify current suite is legal'''
-    if suite.has_key('create') and not suite.has_key('destroy'):
+    if 'create' in suite and 'destroy' not in suite:
         abort( '%s:%s: Suite %s has createSuite() but no destroySuite()' %
                (suite['file'], suite['create'], suite['name']) )
-    if suite.has_key('destroy') and not suite.has_key('create'):
+    if 'destroy' in suite and 'create' not in suite:
         abort( '%s:%s: Suite %s has destroySuite() but no createSuite()' %
                (suite['file'], suite['destroy'], suite['name']) )
 
@@ -474,7 +474,7 @@ def isGenerated(suite):
 
 def isDynamic(suite):
     '''Checks whether a suite is dynamic'''
-    return suite.has_key('create')
+    return 'create' in suite
 
 lastIncluded = ''
 def writeInclude(output, file):
@@ -533,11 +533,11 @@ def runBody( suite, test ):
 def dynamicRun( suite, test ):
     '''Body of TestDescription::run() for test in a dynamic suite'''
     return 'if ( ' + suite['object'] + ' ) ' + suite['object'] + '->' + test['name'] + '();'
-    
+
 def staticRun( suite, test ):
     '''Body of TestDescription::run() for test in a non-dynamic suite'''
     return suite['object'] + '.' + test['name'] + '();'
-    
+
 def writeSuiteDescription( output, suite ):
     '''Write SuiteDescription object'''
     if isDynamic( suite ):