Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2015-05-28 14:01:58 +05:30
parent e1598dc752
commit 6764873483
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/srv/pre_activated.py
View File

@ -13,6 +13,7 @@ from calibre.constants import islinux
def pre_activated_socket(): def pre_activated_socket():
return None return None
has_preactivated_support = False
if islinux: if islinux:
import ctypes import ctypes
@ -36,6 +37,7 @@ if islinux:
pass pass
else: else:
del pre_activated_socket del pre_activated_socket
has_preactivated_support = True
def pre_activated_socket(): def pre_activated_socket():
num = systemd.sd_listen_fds(1) # Remove systemd env vars so that child processes do not inherit them num = systemd.sd_listen_fds(1) # Remove systemd env vars so that child processes do not inherit them
if num > 1: if num > 1:

4
src/calibre/srv/tests/loop.py
View File

@ -15,7 +15,7 @@ except ImportError:
create_server_cert = None create_server_cert = None
from calibre.srv.pre_activated import pre_activated_socket from calibre.srv.pre_activated import pre_activated_socket, has_preactivated_support
from calibre.srv.tests.base import BaseTest, TestServer from calibre.srv.tests.base import BaseTest, TestServer
from calibre.ptempfile import TemporaryDirectory from calibre.ptempfile import TemporaryDirectory
@ -40,7 +40,7 @@ class LoopTest(BaseTest):
subject = dict(x[0] for x in cert['subject']) subject = dict(x[0] for x in cert['subject'])
self.ae(subject['commonName'], address) self.ae(subject['commonName'], address)
@skipIf(pre_activated_socket is None, 'pre_activated_socket not available') @skipIf(not has_preactivated_support, 'pre_activated_socket not available')
def test_socket_activation(self): def test_socket_activation(self):
'Test socket activation' 'Test socket activation'
os.closerange(3, 4) # Ensure the socket gets fileno == 3 os.closerange(3, 4) # Ensure the socket gets fileno == 3