Thrift-5900: Fix Tests for Python 3.14

Client: py
Patch: Carel Combrink

This closes #3239

- Disclaimer: Claude came up with this
- Python 3.14 made files explicitly unpicklable for reasons
- The out can't be pickled in SummaryReporter
- stop in TestDispatcher is an instance method that should not be captured

Delay the imports to where they are needed

- Claude believes this is due to the way that the server is called vs the client is called and the server does not have enough time to set up completely

Attempt to fix issue with python 3.14

- Looks like python is getting more strict about scoping
- Decided to go with a local option instead of global or module variable

Author: CJCombrink

.github/workflows/build.yml

@@ -668,7 +668,7 @@ jobs:
 
       - uses: actions/setup-python@v6
         with:
-          python-version: "3.13" # Pin to 3.13 for now -> see THRIFT-5900
+          python-version: "3.x"
 
       - uses: actions/setup-java@v5
         with:

test/crossrunner/report.py

@@ -240,6 +240,19 @@ def __init__(self, basedir, testdir_relative, concurrent=True):
         self._expected_failure = []
         self._print_header()
 
+    def __getstate__(self):
+        """Prepare object for pickling - remove unpicklable file handle (Since Python 3.14)"""
+        state = self.__dict__.copy()
+        # Remove the unpicklable file handle
+        state['out'] = None
+        return state
+
+    def __setstate__(self, state):
+        """Restore object after unpickling - restore stdout"""
+        self.__dict__.update(state)
+        # Restore stdout (since that's what it was initialized to)
+        self.out = sys.stdout
+
     @property
     def testdir(self):
         return os.path.join(self._basedir, self._testdir_rel)

test/crossrunner/run.py

@@ -374,16 +374,18 @@ def __init__(self, testdir, basedir, logdir_rel, concurrency):
             self._m = multiprocessing.managers.BaseManager()
             self._m.register('ports', PortAllocator)
             self._m.start()
-            self._pool = multiprocessing.Pool(concurrency, self._pool_init, (self._m.address,))
+            self._pool = multiprocessing.Pool(concurrency, TestDispatcher._pool_init, (self._m.address, self._stop))
         self._log.debug(
             'TestDispatcher started with %d concurrent jobs' % concurrency)
 
-    def _pool_init(self, address):
+    @staticmethod
+    def _pool_init(address, stop_event):
         global stop
         global m
         global ports
-        stop = self._stop
+        stop = stop_event
         m = multiprocessing.managers.BaseManager(address)
+        m.register('ports')
         m.connect()
         ports = m.ports()
 

test/py/TestServer.py

@@ -33,65 +33,71 @@
 
 
 class TestHandler(object):
+    def __init__(self, options):
+        self.options = options
+
     def testVoid(self):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testVoid()')
 
     def testString(self, str):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testString(%s)' % str)
         return str
 
     def testBool(self, boolean):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testBool(%s)' % str(boolean).lower())
         return boolean
 
     def testByte(self, byte):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testByte(%d)' % byte)
         return byte
 
     def testI16(self, i16):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testI16(%d)' % i16)
         return i16
 
     def testI32(self, i32):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testI32(%d)' % i32)
         return i32
 
     def testI64(self, i64):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testI64(%d)' % i64)
         return i64
 
     def testDouble(self, dub):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testDouble(%f)' % dub)
         return dub
 
     def testBinary(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testBinary()')  # TODO: hex output
         return thing
 
     def testStruct(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testStruct({%s, %s, %s, %s})' % (thing.string_thing, thing.byte_thing, thing.i32_thing, thing.i64_thing))
         return thing
 
     def testException(self, arg):
-        # if options.verbose > 1:
+        from ThriftTest.ttypes import Xception
+        # if self.options.verbose > 1:
         logging.info('testException(%s)' % arg)
         if arg == 'Xception':
             raise Xception(errorCode=1001, message=arg)
         elif arg == 'TException':
             raise TException(message='This is a TException')
 
     def testMultiException(self, arg0, arg1):
-        if options.verbose > 1:
+        from ThriftTest.ttypes import Xtruct, Xception, Xception2
+
+        if self.options.verbose > 1:
             logging.info('testMultiException(%s, %s)' % (arg0, arg1))
         if arg0 == 'Xception':
             raise Xception(errorCode=1001, message='This is an Xception')
@@ -102,49 +108,49 @@ def testMultiException(self, arg0, arg1):
         return Xtruct(string_thing=arg1)
 
     def testOneway(self, seconds):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testOneway(%d) => sleeping...' % seconds)
         time.sleep(seconds / 3)  # be quick
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('done sleeping')
 
     def testNest(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testNest(%s)' % thing)
         return thing
 
     def testMap(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testMap(%s)' % thing)
         return thing
 
     def testStringMap(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testStringMap(%s)' % thing)
         return thing
 
     def testSet(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testSet(%s)' % thing)
         return thing
 
     def testList(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testList(%s)' % thing)
         return thing
 
     def testEnum(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testEnum(%s)' % thing)
         return thing
 
     def testTypedef(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testTypedef(%s)' % thing)
         return thing
 
     def testMapMap(self, thing):
-        if options.verbose > 1:
+        if self.options.verbose > 1:
             logging.info('testMapMap(%s)' % thing)
         return {
             -4: {
@@ -162,7 +168,9 @@ def testMapMap(self, thing):
         }
 
     def testInsanity(self, argument):
-        if options.verbose > 1:
+        from ThriftTest.ttypes import Insanity
+
+        if self.options.verbose > 1:
             logging.info('testInsanity(%s)' % argument)
         return {
             1: {
@@ -173,7 +181,9 @@ def testInsanity(self, argument):
         }
 
     def testMulti(self, arg0, arg1, arg2, arg3, arg4, arg5):
-        if options.verbose > 1:
+        from ThriftTest.ttypes import Xtruct
+
+        if self.options.verbose > 1:
             logging.info('testMulti(%s, %s, %s, %s, %s, %s)' % (arg0, arg1, arg2, arg3, arg4, arg5))
         return Xtruct(string_thing='Hello2',
                       byte_thing=arg0, i32_thing=arg1, i64_thing=arg2)
@@ -271,7 +281,7 @@ def main(options):
         server_type = 'THttpServer'
 
     # Set up the handler and processor objects
-    handler = TestHandler()
+    handler = TestHandler(options)
     processor = ThriftTest.Processor(handler)
 
     if options.proto.startswith('multi'):
@@ -397,7 +407,6 @@ def exit_gracefully(signum, frame):
     sys.path.insert(0, os.path.join(SCRIPT_DIR, options.genpydir))
 
     from ThriftTest import ThriftTest, SecondService
-    from ThriftTest.ttypes import Xtruct, Xception, Xception2, Insanity
     from thrift.Thrift import TException
     from thrift.TMultiplexedProcessor import TMultiplexedProcessor
     from thrift.transport import THeaderTransport