summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <sfinucan@redhat.com>2022-01-27 16:39:06 +0000
committerStephen Finucane <sfinucan@redhat.com>2022-01-27 16:39:06 +0000
commitd95fd8ac61004b937513d8bc9e36291299d04219 (patch)
treeac97061fa434c1f1001212cd9706c23dc03bd7db
parenteb1fdd8abc68b26c0fac1bd3f900d03e78a43d5c (diff)
downloadglance-d95fd8ac61004b937513d8bc9e36291299d04219.tar.gz
tests: Remove check for os.set_inheritable
This is available on all supported Python versions. Change-Id: I76a696e56e04ec47b107af8e169c04138cf45fbb Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
-rw-r--r--glance/tests/utils.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/glance/tests/utils.py b/glance/tests/utils.py
index 0c67a4d68..2c41fe263 100644
--- a/glance/tests/utils.py
+++ b/glance/tests/utils.py
@@ -269,10 +269,7 @@ def fork_exec(cmd,
os.dup2(fptr.fileno(), desc)
except OSError:
pass
- if pass_fds and hasattr(os, 'set_inheritable'):
- # os.set_inheritable() is only available and needed
- # since Python 3.4. On Python 3.3 and older, file descriptors are
- # inheritable by default.
+ if pass_fds:
for fd in pass_fds:
os.set_inheritable(fd, True)