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

Fix a couple of test failures on Travis

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-22 12:52:03 +05:30
parent 5f59d1b8b7
commit 41541a4385
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ from calibre.srv.pre_activated import 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
from calibre.utils.monotonic import monotonic from calibre.utils.monotonic import monotonic
is_travis = os.environ.get('TRAVIS') == 'true'
class LoopTest(BaseTest): class LoopTest(BaseTest):
@ -103,6 +104,7 @@ class LoopTest(BaseTest):
with TestServer(lambda data:(data.path[0] + data.read()), listen_on='1.1.1.1', fallback_to_detected_interface=True, specialize=specialize) as server: with TestServer(lambda data:(data.path[0] + data.read()), listen_on='1.1.1.1', fallback_to_detected_interface=True, specialize=specialize) as server:
self.assertNotEqual('1.1.1.1', server.address[0]) self.assertNotEqual('1.1.1.1', server.address[0])
@skipIf(is_travis, 'Travis does not support BonJour')
def test_bonjour(self): def test_bonjour(self):
'Test advertising via BonJour' 'Test advertising via BonJour'
from calibre.srv.bonjour import BonJour from calibre.srv.bonjour import BonJour
@ -178,7 +180,7 @@ class LoopTest(BaseTest):
def test_ssl(self): def test_ssl(self):
'Test serving over SSL' 'Test serving over SSL'
s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, 0) s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, 0)
s.bind(('localhost', 0)) s.bind(('localhost', 1338 if is_travis else 0))
address = s.getsockname()[0] address = s.getsockname()[0]
with TemporaryDirectory('srv-test-ssl') as tdir: with TemporaryDirectory('srv-test-ssl') as tdir:
cert_file, key_file, ca_file = map(lambda x:os.path.join(tdir, x), 'cka') cert_file, key_file, ca_file = map(lambda x:os.path.join(tdir, x), 'cka')