Skip to content

Cancel a cancel scope upon entry if its deadline is in the past#909

Merged
njsmith merged 2 commits intopython-trio:masterfrom
oremanj:cancel_immediately
Feb 6, 2019
Merged

Cancel a cancel scope upon entry if its deadline is in the past#909
njsmith merged 2 commits intopython-trio:masterfrom
oremanj:cancel_immediately

Conversation

@oremanj
Copy link
Copy Markdown
Member

@oremanj oremanj commented Feb 5, 2019

Fixes #320. Now that #901 is implemented, the concerns discussed in #835 don't apply.

Fixes python-trio#320. Now that python-trio#901 is implemented, the concerns discussed in python-trio#835 don't apply.
@oremanj oremanj requested a review from njsmith February 5, 2019 21:25
@codecov
Copy link
Copy Markdown

codecov bot commented Feb 5, 2019

Codecov Report

Merging #909 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff            @@
##           master    #909      +/-   ##
=========================================
+ Coverage    99.4%   99.4%   +<.01%     
=========================================
  Files         102     102              
  Lines       12679   12681       +2     
  Branches      926     927       +1     
=========================================
+ Hits        12603   12605       +2     
  Misses         56      56              
  Partials       20      20
Impacted Files Coverage Δ
trio/_core/tests/test_run.py 100% <ø> (ø) ⬆️
trio/_core/tests/tutil.py 100% <ø> (ø) ⬆️
trio/_core/_run.py 99.71% <100%> (ø) ⬆️

@python-trio python-trio deleted a comment from codecov bot Feb 5, 2019
@njsmith
Copy link
Copy Markdown
Member

njsmith commented Feb 5, 2019

Test failure is an intermittent failure in test_open_tcp_listeners_backlog:

@njsmith
Copy link
Copy Markdown
Member

njsmith commented Feb 5, 2019

OK, so the "Queue" button is a trap. It definitely didn't do what we want.

Now I tried clicking the "Rebuild" button that's hidden behind the "..." menu. Maybe that will work better?

@oremanj
Copy link
Copy Markdown
Member Author

oremanj commented Feb 5, 2019

It looks like the rerun worked (https://dev.azure.com/python-trio/trio/_build/results?buildId=152) but github didn't notice, so I guess I'll do the close-and-reopen dance.

@oremanj oremanj closed this Feb 5, 2019
@oremanj oremanj reopened this Feb 5, 2019
@njsmith
Copy link
Copy Markdown
Member

njsmith commented Feb 6, 2019

Hmm, azure's UX could definitely use some improvement here :-)

Anyway, the PR seems fine :-). I'm not sure it makes a huge difference either way, but it's certainly a bit closer to what people expect, so why not.

@njsmith njsmith merged commit 0a815a0 into python-trio:master Feb 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants