Skip to content

Commit 0ee219d

Browse files
committed
Address comments
1 parent ac2bf10 commit 0ee219d

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

changelog/379.bugfix.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Attributes of _WARNING_DETAILS are checked to make sure they can be dumped
2-
prior to serializing the warning for submission to the master node.
1+
Warning attributes are checked to make sure they can be dumped prior to
2+
serializing the warning for submission to the master node.

testing/acceptance_test.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,9 +825,8 @@ def abuse_socket():
825825
# The socket itself will end up attached as a value in
826826
# _WARNING_DETAIL. We need to test that it is not serialized
827827
# (it can't be, so the test will fail if we try to).
828+
@pytest.mark.filterwarnings('always')
828829
def test_func(tmpdir):
829-
warnings.resetwarnings()
830-
warnings.simplefilter('always', ResourceWarning)
831830
abuse_socket()
832831
gc.collect()
833832
"""

xdist/remote.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def serialize_warning_message(warning_message):
224224
try:
225225
dumps(attr)
226226
except DumpError:
227-
result[attr_name] = None
227+
result[attr_name] = repr(attr)
228228
else:
229229
result[attr_name] = attr
230230
return result

0 commit comments

Comments
 (0)