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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-17 11:49:10 +05:30
parent 6f237479e5
commit 304d1a6f90
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/srv/tests/base.py
View File

@ -78,9 +78,7 @@ class TestServer(Thread):
from calibre.srv.opts import Options from calibre.srv.opts import Options
from calibre.srv.loop import ServerLoop from calibre.srv.loop import ServerLoop
from calibre.srv.http_response import create_http_handler from calibre.srv.http_response import create_http_handler
kwargs['shutdown_timeout'] = kwargs.get('shutdown_timeout', 0.1) self.setup_defaults(kwargs)
kwargs['listen_on'] = kwargs.get('listen_on', 'localhost')
kwargs['port'] = kwargs.get('port', 0)
self.loop = ServerLoop( self.loop = ServerLoop(
create_http_handler(handler), create_http_handler(handler),
opts=Options(**kwargs), opts=Options(**kwargs),
@ -90,6 +88,11 @@ class TestServer(Thread):
self.log = self.loop.log self.log = self.loop.log
specialize(self) specialize(self)
def setup_defaults(self, kwargs):
kwargs['shutdown_timeout'] = kwargs.get('shutdown_timeout', 0.1)
kwargs['listen_on'] = kwargs.get('listen_on', 'localhost')
kwargs['port'] = kwargs.get('port', 0)
def run(self): def run(self):
try: try:
self.loop.serve_forever() self.loop.serve_forever()
@ -123,9 +126,7 @@ class LibraryServer(TestServer):
from calibre.srv.loop import ServerLoop from calibre.srv.loop import ServerLoop
from calibre.srv.handler import Handler from calibre.srv.handler import Handler
from calibre.srv.http_response import create_http_handler from calibre.srv.http_response import create_http_handler
kwargs['shutdown_timeout'] = kwargs.get('shutdown_timeout', 0.1) self.setup_defaults(kwargs)
kwargs['listen_on'] = kwargs.get('listen_on', 'localhost')
kwargs['port'] = kwargs.get('port', 0)
opts = Options(**kwargs) opts = Options(**kwargs)
self.libraries = libraries or (library_path,) self.libraries = libraries or (library_path,)
self.handler = Handler(self.libraries, opts, testing=True) self.handler = Handler(self.libraries, opts, testing=True)