Skip to content
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.

Sign up for GitHub

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

Jump to bottom

vm: fix nested timeouts with inverse order + fix flaky test-vm-timeout #7373

Closed
wants to merge 3 commits into from
Closed

vm: fix nested timeouts with inverse order + fix flaky test-vm-timeout #7373

wants to merge 3 commits into from

Commits on Jun 23, 2016

  1. test: fix flaky test-vm-timeout 

    Likely fix the flaky parallel/test-vm-timeout. Increase the outer
timeout in the test checking for nested timeouts with `vm` scripts
so that its firing won’t interfere with the inner timeout.

Fixes: nodejs#6727
    @addaleax
    addaleax committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    c6acc5e View commit details
    Browse the repository at this point in the history

  2. vm: test for abort condition of current invocation 

    When a vm script aborted after a timeout/signal interruption, test
whether the local timeout/signal watchdog was responsible for
terminating the execution.

Without this, when a shorter timer from an outer `vm.run*` invocation
fires before an inner timeout, the inner timeout would throw an error
instead of the outer one, but because it did not witness the timeout
itself, it would assume the termination was the result of a signal
interruption.
    @addaleax
    addaleax committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    39aea05 View commit details
    Browse the repository at this point in the history

  3. Revert "test: mark test-vm-timeout flaky on windows" 

    This reverts commit f34caa9.
    @addaleax
    addaleax committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    ce5f4dc View commit details
    Browse the repository at this point in the history