From 676487348397a1a0bc6f1b2d109403bd9085a714 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 28 May 2015 14:01:58 +0530
Subject: [PATCH] ...

---
 src/calibre/srv/pre_activated.py | 2 ++
 src/calibre/srv/tests/loop.py    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/srv/pre_activated.py b/src/calibre/srv/pre_activated.py
index bea4b40f32..280e26b4fb 100644
--- a/src/calibre/srv/pre_activated.py
+++ b/src/calibre/srv/pre_activated.py
@@ -13,6 +13,7 @@ from calibre.constants import islinux
 
 def pre_activated_socket():
     return None
+has_preactivated_support = False
 
 if islinux:
     import ctypes
@@ -36,6 +37,7 @@ if islinux:
         pass
     else:
         del pre_activated_socket
+        has_preactivated_support = True
         def pre_activated_socket():
             num = systemd.sd_listen_fds(1)  # Remove systemd env vars so that child processes do not inherit them
             if num > 1:
diff --git a/src/calibre/srv/tests/loop.py b/src/calibre/srv/tests/loop.py
index 7457ccffb1..f7c9667512 100644
--- a/src/calibre/srv/tests/loop.py
+++ b/src/calibre/srv/tests/loop.py
@@ -15,7 +15,7 @@ except ImportError:
     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.ptempfile import TemporaryDirectory
 
@@ -40,7 +40,7 @@ class LoopTest(BaseTest):
                 subject = dict(x[0] for x in cert['subject'])
                 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):
         'Test socket activation'
         os.closerange(3, 4)  # Ensure the socket gets fileno == 3