From 91e1ccef724fa44de5b046f55d083b69b71699f7 Mon Sep 17 00:00:00 2001 From: Matthew Loring Date: Tue, 21 Feb 2017 12:20:53 -0800 Subject: [PATCH] Fix restify non-interference tests (#403) PR-URL: https://github.com/GoogleCloudPlatform/cloud-trace-nodejs/pull/403 --- test/non-interference/restify-e2e.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/test/non-interference/restify-e2e.js b/test/non-interference/restify-e2e.js index db0d61fe3..2a0b8feaf 100644 --- a/test/non-interference/restify-e2e.js +++ b/test/non-interference/restify-e2e.js @@ -57,15 +57,17 @@ cp.execFileSync('npm', ['install']); // Reformat tests to use newly installed restify console.log('Reformating tests'); var gcloud_require = 'require(\'' + path.join(__dirname, '..', '..') + - '\').start({ forceNewAgent_: true });'; + '\').start({ forceNewAgent_: true, samplingRate: 0, projectId: \'0\', logLevel: 1 });'; glob(test_glob, function(err, files) { for (var i = 0; i < files.length; i++) { - cp.execFileSync('sed', ['-i.bak', 's#\'use strict\';#' + - '\'use strict\'; ' + gcloud_require + '#g', files[i]]); - if (cp.spawnSync('grep', ['-q', gcloud_require, files[i]]).status) { - cp.execSync('echo "' + gcloud_require + '" | cat - ' + files[i] + - ' >' + files[i] + '.instru.js' + '&& mv ' + files[i] + - '.instru.js' + ' ' + files[i]); + if (i === 0) { + cp.execFileSync('sed', ['-i.bak', 's#\'use strict\';#' + + '\'use strict\'; ' + gcloud_require + '#g', files[i]]); + if (cp.spawnSync('grep', ['-q', gcloud_require, files[i]]).status) { + cp.execSync('echo "' + gcloud_require + '" | cat - ' + files[i] + + ' >' + files[i] + '.instru.js' + '&& mv ' + files[i] + + '.instru.js' + ' ' + files[i]); + } } cp.execFileSync('sed', ['-i.bak', 's#require(\'\\.\\./lib\')#require(\'restify\')#', files[i]]); @@ -73,7 +75,10 @@ glob(test_glob, function(err, files) { // Run tests console.log('Running tests'); var results = cp.spawnSync('make', ['test']); - console.log(results.output[1].toString() || results.output[2].toString()); + var output = results.output[1].toString() || results.output[2].toString(); + console.log(output); + assert(output.indexOf('FAILURES:') === -1); + assert(output.indexOf('OK:') !== -1); // Teardown console.log('Cleaning up');