From 1911b35499d5dc8ded25a9122f02454f0d6a19c0 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 8 Jun 2018 13:15:19 -0400 Subject: [PATCH] Get the fcntl import up to the top as well --- src/allmydata/test/test_introducer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/allmydata/test/test_introducer.py b/src/allmydata/test/test_introducer.py index bb8f02241..3d3d9e88f 100644 --- a/src/allmydata/test/test_introducer.py +++ b/src/allmydata/test/test_introducer.py @@ -8,6 +8,7 @@ from twisted.trial import unittest from twisted.internet import defer, address from twisted.python import log from twisted.python.filepath import FilePath +from twisted.python.reflect import requireModule from twisted.internet.endpoints import AdoptedStreamServerEndpoint from twisted.internet.interfaces import IReactorSocket @@ -26,6 +27,8 @@ from allmydata.client import create_client from allmydata.util import pollmixin, keyutil, idlib, fileutil, iputil, yamlutil import allmydata.test.common_util as testutil +fcntl = requireModule("fcntl") + class LoggingMultiService(service.MultiService): def log(self, msg, **kw): log.msg(msg, **kw) @@ -332,11 +335,10 @@ def foolscapEndpointForPortNumber(portnum): # Bury this reactor import here to minimize the chances of it having # the effect of installing the default reactor. from twisted.internet import reactor - if IReactorSocket.providedBy(reactor): + if fcntl is not None and IReactorSocket.providedBy(reactor): # On POSIX we can take this very safe approach of binding the # actual socket to an address. Once the bind succeeds here, we're # no longer subject to any future EADDRINUSE problems. - import fcntl s = socket() try: s.bind(('', 0))