Better log in tests on failure

This commit is contained in:
Job Evers-Meltzer 2016-12-19 18:17:48 -08:00 committed by jobevers
parent a38e5c855e
commit 439a840700

View file

@ -1,3 +1,5 @@
from lbrynet.core import log_support
import io import io
import logging import logging
from multiprocessing import Process, Event, Queue from multiprocessing import Process, Event, Queue
@ -59,6 +61,7 @@ GenFile = mocks.GenFile
test_create_stream_sd_file = mocks.create_stream_sd_file test_create_stream_sd_file = mocks.create_stream_sd_file
DummyBlobAvailabilityTracker = mocks.BlobAvailabilityTracker DummyBlobAvailabilityTracker = mocks.BlobAvailabilityTracker
log = logging.getLogger(__name__)
log_format = "%(funcName)s(): %(message)s" log_format = "%(funcName)s(): %(message)s"
logging.basicConfig(level=logging.WARNING, format=log_format) logging.basicConfig(level=logging.WARNING, format=log_format)
@ -139,11 +142,7 @@ class LbryUploader(object):
d.addCallback(lambda _: self.create_stream()) d.addCallback(lambda _: self.create_stream())
d.addCallback(self.create_stream_descriptor) d.addCallback(self.create_stream_descriptor)
d.addCallback(self.put_sd_hash_on_queue) d.addCallback(self.put_sd_hash_on_queue)
d.addErrback(log.fail(), 'Failed to start')
def print_error(err):
logging.critical("Server error: %s", err.getErrorMessage())
d.addErrback(print_error)
return d return d
def start_server(self): def start_server(self):
@ -473,11 +472,7 @@ def start_blob_uploader(blob_hash_queue, kill_event, dead_event, slow, is_genero
d.addCallback(lambda _: start_server()) d.addCallback(lambda _: start_server())
d.addCallback(lambda _: create_single_blob()) d.addCallback(lambda _: create_single_blob())
d.addCallback(put_blob_hash_on_queue) d.addCallback(put_blob_hash_on_queue)
d.addErrback(log.fail(), 'Failed to start')
def print_error(err):
logging.critical("Server error: %s", err.getErrorMessage())
d.addErrback(print_error)
return d return d
def start_server(): def start_server():