New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect logcontexts after a Deferred was cancelled #4407

Merged
merged 5 commits into from Jan 17, 2019

Conversation

3 participants
@richvdh
Copy link
Member

richvdh commented Jan 16, 2019

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

@richvdh richvdh requested a review from matrix-org/synapse-core Jan 16, 2019

@erikjohnston
Copy link
Member

erikjohnston left a comment

👍

@erikjohnston

This comment has been minimized.

Copy link
Member

erikjohnston commented Jan 16, 2019

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

@richvdh

This comment has been minimized.

Copy link
Member Author

richvdh commented Jan 16, 2019

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

@codecov-io

This comment has been minimized.

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 Jan 17, 2019

@richvdh

This comment has been minimized.

Copy link
Member Author

richvdh commented Jan 17, 2019

@erikjohnston
Copy link
Member

erikjohnston left a comment

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

@richvdh

This comment has been minimized.

Copy link
Member Author

richvdh commented Jan 17, 2019

yes.

@richvdh richvdh merged commit 676cf2e into develop Jan 17, 2019

5 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@richvdh richvdh added this to To Do in Homeserver Task Board via automation Jan 22, 2019

@richvdh richvdh moved this from To Do to Done in Homeserver Task Board Jan 22, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment