#11686 Fix test_openFileDescriptors in some environments. (#11687)

twisted · Sep 24, 2022 · 47f4763 · 47f4763
2 parents 58bd374 + 746b121
commit 47f4763
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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