From 746b121d994a0132a3b8f8fbcce18ed322701e14 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 24 Sep 2022 08:50:51 -0700 Subject: [PATCH] Fix test_openFileDescriptors in some environments. --- src/twisted/internet/test/test_process.py | 8 ++------ src/twisted/newsfragments/11686.misc | 0 2 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 src/twisted/newsfragments/11686.misc diff --git a/src/twisted/internet/test/test_process.py b/src/twisted/internet/test/test_process.py index 122d314a698..018e0e54b51 100644 --- a/src/twisted/internet/test/test_process.py +++ b/src/twisted/internet/test/test_process.py @@ -19,7 +19,6 @@ import hamcrest -import twisted from twisted.internet import utils from twisted.internet.defer import Deferred, inlineCallbacks, succeed from twisted.internet.error import ProcessDone, ProcessTerminated @@ -34,7 +33,6 @@ # Get the current Python executable as a bytestring. pyExe = FilePath(sys.executable)._asBytesPath() -twistedRoot = FilePath(twisted.__file__).parent().parent() _uidgidSkip = False _uidgidSkipReason = "" @@ -404,12 +402,9 @@ def test_openFileDescriptors(self): source = networkString( """ import sys -sys.path.insert(0, '{}') from twisted.internet import process sys.stdout.write(repr(process._listOpenFDs())) -sys.stdout.flush()""".format( - twistedRoot.path - ) +sys.stdout.flush()""" ) r, w = os.pipe() @@ -456,6 +451,7 @@ def processEnded(self, reason): GatheringProtocol(), pyExe, [pyExe, b"-Wignore", b"-c", source], + env=properEnv, usePTY=self.usePTY, ) diff --git a/src/twisted/newsfragments/11686.misc b/src/twisted/newsfragments/11686.misc new file mode 100644 index 00000000000..e69de29bb2d