Merge branch 'release-3.9' into pick/38653/release-3.9

microsoft · Jun 15, 2020 · 4310f56 · 4310f56
2 parents 07faad8 + c88ed72
commit 4310f56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/request-pr-review.ts b/scripts/request-pr-review.ts
@@ -42,7 +42,7 @@ main().catch(console.error);
 
 async function main() {
     const gh = new Octokit({ auth: options.token });
-    const response = await gh.pulls.createReviewRequest({
+    const response = await gh.pulls.requestReviewers({
         owner: options.owner,
         repo: options.repo,
         pull_number,

diff --git a/src/testRunner/parallel/worker.ts b/src/testRunner/parallel/worker.ts
@@ -41,7 +41,7 @@ namespace Harness.Parallel.Worker {
             return class extends (base as typeof Mocha.Runnable) {
                 resetTimeout() {
                     this.clearTimeout();
-                    if (this.enableTimeouts()) {
+                    if (this.timeout() > 0) {
                         sendMessage({ type: "timeout", payload: { duration: this.timeout() || 1e9 } });
                         this.timer = true;
                     }