From 7f4f9abd0395a3b7f020baa25f4b42b20bb39af6 Mon Sep 17 00:00:00 2001
From: Hitesh Kanwathirtha <hiteshk@microsoft.com>
Date: Wed, 31 May 2017 17:46:47 -0700
Subject: [PATCH] test: fix unit test failures after merge

Marked one test flaky, and provided error message for test-buffer-fill.js
---
 test/parallel/parallel.status     | 1 +
 test/parallel/test-buffer-fill.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 8a7024b6408..3dc4689f7cd 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -29,6 +29,7 @@ test-fs-watch-encoding               : FAIL, PASS
 [$jsEngine==chakracore]
 test-assert-checktag : PASS,FLAKY
 test-async-wrap-getasyncid : PASS,FLAKY
+test-async-wrap-promise-after-enabled : PASS,FLAKY
 test-buffer-bindingobj-no-zerofill : PASS,FLAKY
 test-buffer-sharedarraybuffer : PASS,FLAKY
 test-child-process-promisified : PASS,FLAKY
diff --git a/test/parallel/test-buffer-fill.js b/test/parallel/test-buffer-fill.js
index e85fb63238a..c7bc157184a 100644
--- a/test/parallel/test-buffer-fill.js
+++ b/test/parallel/test-buffer-fill.js
@@ -410,7 +410,7 @@ assert.throws(() => {
   if (common.isChakraEngine) {
     // Skip on ChakraCore due to TypedArray .length JIT bug
     // (see this issue: https://github.com/Microsoft/ChakraCore/issues/2319)
-    throw new RangeError();
+    throw new RangeError('Index out of range');
   }
   const buf = new Buffer('w00t');
   Object.defineProperty(buf, 'length', {