ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-23 14:52:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '3564.eliot-log-testing-python-3' into 3566.web-tests-python-3-part-2

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-12-21 13:20:50 -05:00
commit b46898f667
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/allmydata/test/test_eliotutil.py
View File

@ -57,11 +57,14 @@ from ..util.eliotutil import (
_parse_destination_description,
_EliotLogging,
)
from ..util.jsonbytes import BytesJSONEncoder
from .common import (
SyncTestCase,
AsyncTestCase,
)
class EliotLoggedTestTests(AsyncTestCase):
def test_returns_none(self):
Message.log(hello="world")
@ -94,7 +97,7 @@ class ParseDestinationDescriptionTests(SyncTestCase):
reactor = object()
self.assertThat(
_parse_destination_description("file:-")(reactor),
Equals(FileDestination(stdout)),
Equals(FileDestination(stdout, encoder=BytesJSONEncoder)),
)

5
src/allmydata/util/eliotutil.py
View File

@ -86,6 +86,9 @@ from twisted.internet.defer import (
)
from twisted.application.service import Service
from .jsonbytes import BytesJSONEncoder
def validateInstanceOf(t):
"""
Return an Eliot validator that requires values to be instances of ``t``.
@ -302,7 +305,7 @@ class _DestinationParser(object):
rotateLength=rotate_length,
maxRotatedFiles=max_rotated_files,
)
return lambda reactor: FileDestination(get_file())
return lambda reactor: FileDestination(get_file(), BytesJSONEncoder)
_parse_destination_description = _DestinationParser().parse