Some MQTT tests are slow (10 seconds)

Fixes #1660
GladysAssistant · Dec 11, 2022 · 3758144 · 3758144
1 parent 900b125
commit 3758144
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 18 deletions.
diff --git a/server/services/mqtt/lib/installContainer.js b/server/services/mqtt/lib/installContainer.js
@@ -62,6 +62,8 @@ async function installContainer(saveConfiguration = true) {
   }
 
   if (saveConfiguration) {
+    logger.info('MQTT saving configuration');
+
     await this.saveConfiguration({
       mqttUrl: 'mqtt://localhost',
       mqttUsername: 'gladys',
@@ -70,6 +72,8 @@ async function installContainer(saveConfiguration = true) {
     });
   }
 
+  logger.info('MQTT installed');
+
   return container;
 }
 

diff --git a/server/test/services/mqtt/lib/installContainer.test.js b/server/test/services/mqtt/lib/installContainer.test.js
@@ -1,27 +1,33 @@
 const sinon = require('sinon');
+const proxyquire = require('proxyquire').noCallThru();
 const { expect } = require('chai');
 
 const { assert, fake } = sinon;
 
-const proxiquire = require('proxyquire').noCallThru();
-
 const { MockedMqttClient } = require('../mocks.test');
 const { EVENTS, WEBSOCKET_MESSAGE_TYPES } = require('../../../../utils/constants');
 const { DEFAULT } = require('../../../../services/mqtt/lib/constants');
 
 const execMock = { exec: fake.resolves('command well executed') };
-const installContainer = proxiquire('../../../../services/mqtt/lib/installContainer', {
+const installContainer = proxyquire('../../../../services/mqtt/lib/installContainer', {
   '../../../utils/childProcess': execMock,
 });
-const MqttHandler = proxiquire('../../../../services/mqtt/lib', {
+const saveConfiguration = proxyquire('../../../../services/mqtt/lib/saveConfiguration', {
+  util: {
+    // Fake promisify to revolve it directly
+    promisify: () => () => {},
+  },
+});
+
+const MqttHandler = proxyquire('../../../../services/mqtt/lib', {
   './installContainer': installContainer,
+  './saveConfiguration': saveConfiguration,
 });
 
 const serviceId = 'faea9c35-759a-44d5-bcc9-2af1de37b8b4';
 
-describe('mqttHandler.installContainer', function Describe() {
-  this.timeout(8000);
-  beforeEach(() => {
+describe('mqttHandler.installContainer', () => {
+  afterEach(() => {
     sinon.reset();
   });
 

diff --git a/server/test/services/mqtt/lib/saveConfiguration.test.js b/server/test/services/mqtt/lib/saveConfiguration.test.js
@@ -1,18 +1,27 @@
 const sinon = require('sinon');
+const proxyquire = require('proxyquire').noCallThru();
 const { expect } = require('chai');
 
 const { assert, fake } = sinon;
 const { MockedMqttClient } = require('../mocks.test');
 const { CONFIGURATION, DEFAULT } = require('../../../../services/mqtt/lib/constants');
 const { NotFoundError } = require('../../../../utils/coreErrors');
-const MqttHandler = require('../../../../services/mqtt/lib');
 
-const serviceId = 'faea9c35-759a-44d5-bcc9-2af1de37b8b4';
+const saveConfiguration = proxyquire('../../../../services/mqtt/lib/saveConfiguration', {
+  util: {
+    // Fake promisify to revolve it directly
+    promisify: () => () => {},
+  },
+});
 
-describe('mqttHandler.saveConfiguration', function Describe() {
-  this.timeout(15000);
+const MqttHandler = proxyquire('../../../../services/mqtt/lib', {
+  './saveConfiguration': saveConfiguration,
+});
+
+const serviceId = 'faea9c35-759a-44d5-bcc9-2af1de37b8b4';
 
-  beforeEach(() => {
+describe('mqttHandler.saveConfiguration', () => {
+  afterEach(() => {
     sinon.reset();
   });
 

diff --git a/server/test/services/mqtt/lib/updateContainer.test.js b/server/test/services/mqtt/lib/updateContainer.test.js
@@ -1,15 +1,22 @@
 const sinon = require('sinon');
+const proxyquire = require('proxyquire').noCallThru();
 
 const { assert, fake } = sinon;
 
-const proxiquire = require('proxyquire').noCallThru();
-
 const { MockedMqttClient } = require('../mocks.test');
 const { CONFIGURATION, DEFAULT } = require('../../../../services/mqtt/lib/constants');
 
 const installContainerMock = { installContainer: fake.resolves({ id: 'id' }) };
-const MqttHandler = proxiquire('../../../../services/mqtt/lib', {
+const saveConfiguration = proxyquire('../../../../services/mqtt/lib/saveConfiguration', {
+  util: {
+    // Fake promisify to revolve it directly
+    promisify: () => () => {},
+  },
+});
+
+const MqttHandler = proxyquire('../../../../services/mqtt/lib', {
   './installContainer': installContainerMock,
+  './saveConfiguration': saveConfiguration,
 });
 
 const gladys = {
@@ -24,9 +31,7 @@ const gladys = {
 };
 const serviceId = 'faea9c35-759a-44d5-bcc9-2af1de37b8b4';
 
-describe('mqttHandler.updateContainer', function Describe() {
-  this.timeout(8000);
-
+describe('mqttHandler.updateContainer', () => {
   let mqttHandler;
 
   beforeEach(() => {