From 0bd6ac8c99e8f556a8ceef30fd15a3e03932a68f Mon Sep 17 00:00:00 2001 From: Matt Woicik Date: Wed, 26 Jul 2017 17:30:54 -0400 Subject: [PATCH 1/5] "test: fix error when foo in path to git clone I fixed an error that occured in the test case of the file test/parallel/test-assert-fail.js when foo was in the path to the git clone. This occured due to a regex that looked only for the word foo, and so it was updated to not look for foo/, but only foo. This way it won't go off from foo being in the path to the git clone" --- test/parallel/test-assert-fail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-assert-fail.js b/test/parallel/test-assert-fail.js index 12cff99e66c88d..2922a3fdaf0ab0 100644 --- a/test/parallel/test-assert-fail.js +++ b/test/parallel/test-assert-fail.js @@ -67,5 +67,5 @@ common.expectsError(() => { // The stackFrameFunction should exclude the foo frame assert.throws( function foo() { assert.fail('first', 'second', 'message', '!==', foo); }, - (err) => !/foo/m.test(err.stack) + (err) => !/foo(?!\/)/m.test(err.stack) ); From 8d7445c47949a19bedd53b624631e5a7f021cd7d Mon Sep 17 00:00:00 2001 From: Matt Woicik Date: Wed, 26 Jul 2017 18:15:13 -0400 Subject: [PATCH 2/5] "test assert: edit to regex error when foo in path to git clone " --- test/parallel/test-assert-fail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-assert-fail.js b/test/parallel/test-assert-fail.js index 2922a3fdaf0ab0..c382e13eda9ca4 100644 --- a/test/parallel/test-assert-fail.js +++ b/test/parallel/test-assert-fail.js @@ -67,5 +67,5 @@ common.expectsError(() => { // The stackFrameFunction should exclude the foo frame assert.throws( function foo() { assert.fail('first', 'second', 'message', '!==', foo); }, - (err) => !/foo(?!\/)/m.test(err.stack) + (err) => !/\sat\sfoo/.test(err.stack) ); From 8bcca8fce93a0c78c8010d3935bcb746e611e528 Mon Sep 17 00:00:00 2001 From: Matt Woicik Date: Wed, 26 Jul 2017 18:24:15 -0400 Subject: [PATCH 3/5] "test assert: edit to test case when foo is in path to git clone " --- test/parallel/test-assert-fail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-assert-fail.js b/test/parallel/test-assert-fail.js index c382e13eda9ca4..46f28675f57c5d 100644 --- a/test/parallel/test-assert-fail.js +++ b/test/parallel/test-assert-fail.js @@ -67,5 +67,5 @@ common.expectsError(() => { // The stackFrameFunction should exclude the foo frame assert.throws( function foo() { assert.fail('first', 'second', 'message', '!==', foo); }, - (err) => !/\sat\sfoo/.test(err.stack) + (err) => !/\sat\sfoo\b/.test(err.stack) ); From ed89e4beccf1d873222b2689d9cd744c43465c0e Mon Sep 17 00:00:00 2001 From: Matt Woicik Date: Wed, 26 Jul 2017 18:28:42 -0400 Subject: [PATCH 4/5] "test assert: update to prior commit, more specific regex " --- test/parallel/test-assert-fail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-assert-fail.js b/test/parallel/test-assert-fail.js index 46f28675f57c5d..ced756a3cd3887 100644 --- a/test/parallel/test-assert-fail.js +++ b/test/parallel/test-assert-fail.js @@ -67,5 +67,5 @@ common.expectsError(() => { // The stackFrameFunction should exclude the foo frame assert.throws( function foo() { assert.fail('first', 'second', 'message', '!==', foo); }, - (err) => !/\sat\sfoo\b/.test(err.stack) + (err) => !/^\s*at\sfoo\b/.test(err.stack) ); From 441a7b44892e4ac6f95c7df9afdab469f528f80b Mon Sep 17 00:00:00 2001 From: Matt Woicik Date: Wed, 26 Jul 2017 18:38:42 -0400 Subject: [PATCH 5/5] "test assert: update to previous commit of regex " --- test/parallel/test-assert-fail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-assert-fail.js b/test/parallel/test-assert-fail.js index ced756a3cd3887..efa48cc215cfdb 100644 --- a/test/parallel/test-assert-fail.js +++ b/test/parallel/test-assert-fail.js @@ -67,5 +67,5 @@ common.expectsError(() => { // The stackFrameFunction should exclude the foo frame assert.throws( function foo() { assert.fail('first', 'second', 'message', '!==', foo); }, - (err) => !/^\s*at\sfoo\b/.test(err.stack) + (err) => !/^\s*at\sfoo\b/m.test(err.stack) );