meta: merge node/master into node-chakracore/master

Merge 81c2b59 as of 2017-12-25 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Taylor Woll <[email protected]>
nodejs · Jan 20, 2018 · 3f73796 · 3f73796
2 parents b57a8a0 + 81c2b59
commit 3f73796
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/async_wrap.cc b/src/async_wrap.cc
@@ -343,8 +343,7 @@ static void PromiseHook(PromiseHookType type, Local<Promise> promise,
 static void SetupHooks(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
-  if (!args[0]->IsObject())
-    return env->ThrowTypeError("first argument must be an object");
+  CHECK(args[0]->IsObject());
 
   // All of init, before, after, destroy are supplied by async_hooks
   // internally, so this should every only be called once. At which time all

diff --git a/test/parallel/test-benchmark-fs.js b/test/parallel/test-benchmark-fs.js
@@ -3,6 +3,8 @@
 const common = require('../common');
 const runBenchmark = require('../common/benchmark');
 
+common.refreshTmpDir();
+
 runBenchmark('fs', [
   'n=1',
   'size=1',