diff options
| author | Zuul <zuul@review.opendev.org> | 2022-02-16 20:59:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-02-16 20:59:13 +0000 |
| commit | 52af68247e6de7e278f584c38980e4a3b569e982 (patch) | |
| tree | 261366737146fd1503b474cc23665037db370b6f | |
| parent | 241d44258242464652bf961e00012e9541f5cd7f (diff) | |
| parent | d95fd8ac61004b937513d8bc9e36291299d04219 (diff) | |
| download | glance-52af68247e6de7e278f584c38980e4a3b569e982.tar.gz | |
Merge "tests: Remove check for os.set_inheritable"
| -rw-r--r-- | glance/tests/utils.py | 5 |
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) |