test: abstract skip functionality to common

The tap skipping output is so prevalent yet obscure in nature that we ought to move it into it's own function in test/common.js PR-URL: #6697 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Fedor Indutny <[email protected]>

Author: Fishrock123

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js

@@ -8,10 +8,9 @@ const assert = require('assert');
 // v8::String::kMaxLength defined in v8.h
 constkStringMaxLength=process.binding('buffer').kStringMaxLength;
 
-constskipMessage=
-'1..0 # Skipped: intensive toString tests due to memory confinements';
+constskipMessage='intensive toString tests due to memory confinements';
 if(!common.enoughTestMem){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
@@ -20,13 +19,13 @@ try{
 }catch(e){
 // If the exception is not due to memory confinement then rethrow it.
 if(e.message!=='Array buffer allocation failed')throw(e);
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
 if(!binding.ensureAllocation(2*kStringMaxLength)){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js

@@ -4,10 +4,9 @@ const common = require('../../common');
 constbinding=require('./build/Release/binding');
 constassert=require('assert');
 
-constskipMessage=
-'1..0 # Skipped: intensive toString tests due to memory confinements';
+constskipMessage='intensive toString tests due to memory confinements';
 if(!common.enoughTestMem){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
@@ -20,13 +19,13 @@ try{
 }catch(e){
 // If the exception is not due to memory confinement then rethrow it.
 if(e.message!=='Array buffer allocation failed')throw(e);
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
 if(!binding.ensureAllocation(2*kStringMaxLength)){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js

@@ -4,10 +4,9 @@ const common = require('../../common');
 constbinding=require('./build/Release/binding');
 constassert=require('assert');
 
-constskipMessage=
-'1..0 # Skipped: intensive toString tests due to memory confinements';
+constskipMessage='intensive toString tests due to memory confinements';
 if(!common.enoughTestMem){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
@@ -20,13 +19,13 @@ try{
 }catch(e){
 // If the exception is not due to memory confinement then rethrow it.
 if(e.message!=='Array buffer allocation failed')throw(e);
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
 if(!binding.ensureAllocation(2*kStringMaxLength)){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js

@@ -4,10 +4,9 @@ const common = require('../../common');
 constbinding=require('./build/Release/binding');
 constassert=require('assert');
 
-constskipMessage=
-'1..0 # Skipped: intensive toString tests due to memory confinements';
+constskipMessage='intensive toString tests due to memory confinements';
 if(!common.enoughTestMem){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
@@ -20,13 +19,13 @@ try{
 }catch(e){
 // If the exception is not due to memory confinement then rethrow it.
 if(e.message!=='Array buffer allocation failed')throw(e);
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
 if(!binding.ensureAllocation(2*kStringMaxLength)){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js

@@ -4,10 +4,9 @@ const common = require('../../common');
 constbinding=require('./build/Release/binding');
 constassert=require('assert');
 
-constskipMessage=
-'1..0 # Skipped: intensive toString tests due to memory confinements';
+constskipMessage='intensive toString tests due to memory confinements';
 if(!common.enoughTestMem){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
@@ -20,13 +19,13 @@ try{
 }catch(e){
 // If the exception is not due to memory confinement then rethrow it.
 if(e.message!=='Array buffer allocation failed')throw(e);
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
 if(!binding.ensureAllocation(2*kStringMaxLength)){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js

@@ -4,10 +4,9 @@ const common = require('../../common');
 constbinding=require('./build/Release/binding');
 constassert=require('assert');
 
-constskipMessage=
-'1..0 # Skipped: intensive toString tests due to memory confinements';
+constskipMessage='intensive toString tests due to memory confinements';
 if(!common.enoughTestMem){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
@@ -20,13 +19,13 @@ try{
 }catch(e){
 // If the exception is not due to memory confinement then rethrow it.
 if(e.message!=='Array buffer allocation failed')throw(e);
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
 if(!binding.ensureAllocation(2*kStringMaxLength)){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js

@@ -4,10 +4,9 @@ const common = require('../../common');
 constbinding=require('./build/Release/binding');
 constassert=require('assert');
 
-constskipMessage=
-'1..0 # Skipped: intensive toString tests due to memory confinements';
+constskipMessage='intensive toString tests due to memory confinements';
 if(!common.enoughTestMem){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
@@ -20,13 +19,13 @@ try{
 }catch(e){
 // If the exception is not due to memory confinement then rethrow it.
 if(e.message!=='Array buffer allocation failed')throw(e);
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
 if(!binding.ensureAllocation(2*kStringMaxLength)){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js

@@ -4,10 +4,9 @@ const common = require('../../common');
 constbinding=require('./build/Release/binding');
 constassert=require('assert');
 
-constskipMessage=
-'1..0 # Skipped: intensive toString tests due to memory confinements';
+constskipMessage='intensive toString tests due to memory confinements';
 if(!common.enoughTestMem){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
@@ -20,13 +19,13 @@ try{
 }catch(e){
 // If the exception is not due to memory confinement then rethrow it.
 if(e.message!=='Array buffer allocation failed')throw(e);
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
 if(!binding.ensureAllocation(2*kStringMaxLength)){
-console.log(skipMessage);
+common.skip(skipMessage);
 return;
 }
 

test/common.js

@@ -465,6 +465,9 @@ exports.fail = function(msg){
 assert.fail(null,null,msg);
 };
 
+exports.skip=function(msg){
+console.log(`1..0 # Skipped: ${msg}`);
+};
 
 // A stream to push an array into a REPL
 functionArrayStream(){

test/disabled/tls_server.js

@@ -13,7 +13,7 @@ var certPem = fs.readFileSync(common.fixturesDir + '/cert.pem');
 try{
 varcredentials=crypto.createCredentials({key: keyPem,cert: certPem});
 }catch(e){
-console.log('1..0 # Skipped: node compiled without OpenSSL.');
+common.skip('node compiled without OpenSSL.');
 return;
 }
 vari=0;