Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix incorrect logcontexts after a Deferred was cancelled #4407

Merged
merged 5 commits into from
Jan 17, 2019

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jan 16, 2019

... mostly because I wanted to check it did the right thing with logcontexts.

@richvdh richvdh requested a review from a team January 16, 2019 18:09
Copy link
Member

@erikjohnston erikjohnston left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@erikjohnston
Copy link
Member

Although the new test has failed on one of the runs...

@richvdh
Copy link
Member Author

richvdh commented Jan 16, 2019

it's found a bug in an old version of twisted, I think...

@codecov-io
Copy link

codecov-io commented Jan 17, 2019

Codecov Report

Merging #4407 into develop will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #4407      +/-   ##
===========================================
+ Coverage    73.65%   73.68%   +0.02%     
===========================================
  Files          300      300              
  Lines        29815    29818       +3     
  Branches      4897     4898       +1     
===========================================
+ Hits         21961    21971      +10     
+ Misses        6412     6406       -6     
+ Partials      1442     1441       -1
Impacted Files Coverage Δ
synapse/python_dependencies.py 45.83% <ø> (ø) ⬆️
synapse/util/async_helpers.py 91.44% <ø> (+2.13%) ⬆️
synapse/handlers/device.py 79.68% <0%> (-0.97%) ⬇️
synapse/config/key.py 67.64% <0%> (ø) ⬆️
synapse/util/logcontext.py 89.47% <0%> (+0.43%) ⬆️
synapse/util/file_consumer.py 82.45% <0%> (+1.75%) ⬆️
synapse/storage/background_updates.py 95.8% <0%> (+2.79%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f1a6a4...89d4c38. Read the comment docs.

@richvdh richvdh changed the title Add some tests for time_out_deferred Fix incorrect logcontexts after a Deferred was cancelled Jan 17, 2019
@richvdh richvdh requested a review from erikjohnston January 17, 2019 12:41
@richvdh
Copy link
Member Author

richvdh commented Jan 17, 2019

@erikjohnston ptal

Copy link
Member

@erikjohnston erikjohnston left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume the "fix" here is the bump of twisted version?

@richvdh
Copy link
Member Author

richvdh commented Jan 17, 2019

yes.

@richvdh richvdh merged commit 676cf2e into develop Jan 17, 2019
@richvdh richvdh deleted the rav/time_out_deferred_tests branch December 1, 2020 12:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants