t2: add missing help to crash-reporter (shows status). Fixes gh-708 (#…

…713) Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
tessel · Apr 27, 2016 · 41de6c8 · 41de6c8
1 parent bc23cca
commit 41de6c8
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 25 deletions.
diff --git a/bin/tessel-2.js b/bin/tessel-2.js
@@ -83,25 +83,24 @@ parser.command('install-drivers')
 
 parser.command('crash-reporter')
   .callback(opts => {
+    var cr = Promise.resolve();
+
     // t2 crash-reporter --on
     if (opts.on) {
-      return CrashReporter.on().then(() => {
-        // t2 crash-reporter --on --test
-        if (opts.test) {
-          CrashReporter.test().then(module.exports.closeSuccessfulCommand);
-        }
-      }).then(module.exports.closeSuccessfulCommand, module.exports.closeFailedCommand);
+      cr = CrashReporter.on();
     } else if (opts.off) {
-      // t2 crash-reporter --on
-      return CrashReporter.off()
-        .then(module.exports.closeSuccessfulCommand, module.exports.closeFailedCommand);
+      // t2 crash-reporter --off
+      cr = CrashReporter.off();
     }
 
     // t2 crash-reporter --test
     if (opts.test) {
       // not handling failures, as we want to trigger a crash
-      CrashReporter.test()
+      cr.then(CrashReporter.test)
         .then(module.exports.closeSuccessfulCommand);
+    } else {
+      cr.then(CrashReporter.status)
+        .then(module.exports.closeSuccessfulCommand, module.exports.closeFailedCommand);
     }
   })
   .option('off', {
@@ -116,7 +115,7 @@ parser.command('crash-reporter')
     flag: true,
     help: 'Test the Crash Reporter.'
   })
-  .help('Crash Reporter enable/disable');
+  .help('Configure the Crash Reporter.');
 
 parser.command('provision')
   .callback(callControllerCallback('provisionTessel'))

diff --git a/lib/crash-reporter.js b/lib/crash-reporter.js
@@ -106,6 +106,13 @@ CrashReporter.post = function(labels, report) {
   });
 };
 
+CrashReporter.status = () => {
+  return Preferences.load().then(prefs => {
+    logs.info(`Crash Reporter is ${prefs[CRASH_REPORTER_PREFERENCE].toUpperCase()}`);
+  });
+};
+
+
 CrashReporter.test = () => {
   return Promise.reject(new Error('Testing the crash reporter'));
 };

diff --git a/test/unit/bin-tessel-2.js b/test/unit/bin-tessel-2.js
@@ -747,6 +747,7 @@ exports['Tessel (cli: crash-reporter)'] = {
     this.crOn = this.sandbox.stub(CrashReporter, 'on').returns(Promise.resolve());
     this.crOff = this.sandbox.stub(CrashReporter, 'off').returns(Promise.resolve());
     this.crPost = this.sandbox.stub(CrashReporter, 'post').returns(Promise.resolve());
+    this.crStatus = this.sandbox.stub(CrashReporter, 'status').returns(Promise.resolve());
     this.crSubmit = this.sandbox.stub(CrashReporter, 'submit').returns(Promise.resolve());
     this.crTest = this.sandbox.stub(CrashReporter, 'test').returns(Promise.resolve());
 
@@ -759,59 +760,71 @@ exports['Tessel (cli: crash-reporter)'] = {
   },
 
   callThroughNoOptions: function(test) {
-    test.expect(3);
+    test.expect(4);
+
+    var resolve = Promise.resolve();
+    this.crStatus.restore();
+    this.crStatus = this.sandbox.stub(CrashReporter, 'status').returns(resolve);
 
     cli(['crash-reporter']);
 
     test.equal(this.crOn.callCount, 0);
     test.equal(this.crOff.callCount, 0);
     test.equal(this.crTest.callCount, 0);
 
-
-    test.done();
+    resolve.then(() => {
+      test.equal(this.crStatus.callCount, 1);
+      test.done();
+    });
   },
 
   on: function(test) {
-    test.expect(3);
+    test.expect(4);
 
     cli(['crash-reporter', '--on=true']);
 
     test.equal(this.crOn.callCount, 1);
     test.equal(this.crOff.callCount, 0);
     test.equal(this.crTest.callCount, 0);
-
+    test.equal(this.crStatus.callCount, 0);
 
     test.done();
   },
 
   off: function(test) {
-    test.expect(3);
+    test.expect(4);
 
     cli(['crash-reporter', '--off=true']);
 
     test.equal(this.crOn.callCount, 0);
     test.equal(this.crOff.callCount, 1);
     test.equal(this.crTest.callCount, 0);
-
+    test.equal(this.crStatus.callCount, 0);
 
     test.done();
   },
 
   test: function(test) {
-    test.expect(3);
+    test.expect(4);
+
+    var resolve = Promise.resolve();
+    this.crTest.restore();
+    this.crTest = this.sandbox.stub(CrashReporter, 'test').returns(resolve);
 
     cli(['crash-reporter', '--test=true']);
 
     test.equal(this.crOn.callCount, 0);
     test.equal(this.crOff.callCount, 0);
-    test.equal(this.crTest.callCount, 1);
-
+    test.equal(this.crStatus.callCount, 0);
 
-    test.done();
+    resolve.then(() => {
+      test.equal(this.crTest.callCount, 1);
+      test.done();
+    });
   },
 
   onAndTest: function(test) {
-    test.expect(3);
+    test.expect(4);
 
     var resolve = Promise.resolve();
     this.crOn.restore();
@@ -823,13 +836,14 @@ exports['Tessel (cli: crash-reporter)'] = {
       test.equal(this.crOn.callCount, 1);
       test.equal(this.crOff.callCount, 0);
       test.equal(this.crTest.callCount, 1);
+      test.equal(this.crStatus.callCount, 0);
 
       test.done();
     });
   },
 
   onNoTestThrough: function(test) {
-    test.expect(3);
+    test.expect(4);
 
     var resolve = Promise.resolve();
     this.crOn.restore();
@@ -841,13 +855,14 @@ exports['Tessel (cli: crash-reporter)'] = {
       test.equal(this.crOn.callCount, 1);
       test.equal(this.crOff.callCount, 0);
       test.equal(this.crTest.callCount, 0);
+      test.equal(this.crStatus.callCount, 1);
 
       test.done();
     });
   },
 
   unsuccessful: function(test) {
-    test.expect(3);
+    test.expect(4);
 
     var resolve = Promise.resolve();
     this.crOn.restore();
@@ -859,6 +874,7 @@ exports['Tessel (cli: crash-reporter)'] = {
       test.equal(this.crOn.callCount, 1);
       test.equal(this.crOff.callCount, 0);
       test.equal(this.crTest.callCount, 0);
+      test.equal(this.crStatus.callCount, 1);
       test.done();
     });
   },

diff --git a/test/unit/crash-reporter.js b/test/unit/crash-reporter.js
@@ -221,5 +221,27 @@ exports['CrashReporter.post'] = {
       test.done();
     });
   },
+};
 
+exports['CrashReporter.status'] = {
+  setUp: function(done) {
+    this.sandbox = sinon.sandbox.create();
+    this.logsInfo = this.sandbox.stub(logs, 'info');
+    this.crPost = this.sandbox.spy(CrashReporter, 'status');
+    done();
+  },
+
+  tearDown: function(done) {
+    this.sandbox.restore();
+    done();
+  },
+
+  status: function(test) {
+    test.expect(1);
+
+    CrashReporter.status().then(() => {
+      test.equal(this.logsInfo.callCount, 1);
+      test.done();
+    });
+  },
 };