tests: make use of the new sleep function

I added it in the util folder so I can use it everywhere, because I have written it way too many times
stanford-oval · Oct 22, 2019 · 9fc1911 · 9fc1911
1 parent 1252155
commit 9fc1911
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 30 deletions.
diff --git a/tests/training/index.js b/tests/training/index.js
@@ -18,15 +18,10 @@ const assert = require('assert');
 //const Tp = require('thingpedia');
 
 const db = require('../../util/db');
+const sleep = require('../../util/sleep');
 const trainingJobModel = require('../../model/training_job');
 const TrainingServer = require('../../util/training_server');
 
-async function delay(ms) {
-    return new Promise((resolve, reject) => {
-        setTimeout(resolve, ms);
-    });
-}
-
 async function waitUntilAllJobsDone() {
     for (;;) {
         const row = await db.withClient((dbClient) => {
@@ -37,7 +32,7 @@ async function waitUntilAllJobsDone() {
         if (row.cnt === 0)
             break;
 
-        await delay(10000);
+        await sleep(10000);
     }
 
     const failed = await db.withClient((dbClient) => {
@@ -74,7 +69,7 @@ async function testBasic() {
     // issue a basic train command
 
     await server.queue('en', null, 'train');
-    await delay(1000);
+    await sleep(1000);
 
     const queue = await db.withClient((dbClient) => server.getJobQueue(dbClient));
     //console.log(queue);
@@ -185,7 +180,7 @@ async function testForDevice() {
     // issue a train command for a device that is not approved
 
     await server.queue('en', ['org.thingpedia.builtin.test.adminonly'], 'train');
-    await delay(1000);
+    await sleep(1000);
 
     const queue = await db.withClient((dbClient) => server.getJobQueue(dbClient));
     //console.log(queue);

diff --git a/tests/unit/test_lock.js b/tests/unit/test_lock.js
@@ -12,12 +12,7 @@
 const assert = require('assert');
 
 const Lock = require('../../util/lock');
-
-function delay(timeout) {
-    return new Promise((resolve, reject) => {
-        setTimeout(resolve, timeout);
-    });
-}
+const sleep = require('../../util/sleep');
 
 async function withTimeout(promise, timeout = 30000) {
     await Promise.race([
@@ -50,20 +45,20 @@ async function testInterleave() {
     async function thread1() {
         const release1 = await lock.acquire();
         output.push(1);
-        await delay(1000);
+        await sleep(1000);
         output.push(2);
         release1();
-        await delay(1000);
+        await sleep(1000);
         const release2 = await lock.acquire();
         output.push(5);
         release2();
     }
 
     async function thread2() {
-        await delay(500);
+        await sleep(500);
         const release1 = await lock.acquire();
         output.push(3);
-        await delay(500);
+        await sleep(500);
         output.push(4);
         release1();
     }
@@ -82,22 +77,22 @@ async function testQueue() {
     async function thread1() {
         const release1 = await lock.acquire();
         output.push(1);
-        await delay(5000);
+        await sleep(5000);
         output.push(2);
         release1();
     }
 
     async function thread2() {
-        await delay(500);
+        await sleep(500);
         const release1 = await lock.acquire();
         output.push(3);
-        await delay(500);
+        await sleep(500);
         output.push(4);
         release1();
     }
 
     async function thread3() {
-        await delay(1500);
+        await sleep(1500);
         const release1 = await lock.acquire();
         output.push(5);
         output.push(6);

diff --git a/tests/website/test_admin.js b/tests/website/test_admin.js
@@ -15,6 +15,7 @@ const { assertHttpError, assertRedirect, assertLoginRequired, assertBlocked, ses
 const { login, startSession } = require('../login');
 
 const db = require('../../util/db');
+const sleep = require('../../util/sleep');
 const EngineManagerClient = require('../../almond/enginemanagerclient');
 
 const Config = require('../../config');
@@ -44,12 +45,6 @@ async function testAdminUsers(root, bob, nobody) {
     assert(rootUserPage2.indexOf('root@localhost') >= 0);
 }
 
-function delay(ms) {
-    return new Promise((resolve, reject) => {
-        setTimeout(resolve, ms);
-    });
-}
-
 async function testAdminKillRestart(root, bob, nobody) {
     const emc = EngineManagerClient.get();
     assert (await emc.isRunning(1)); // root
@@ -71,7 +66,7 @@ async function testAdminKillRestart(root, bob, nobody) {
     assert (!await emc.isRunning(5)); // emma -or- alexa_user
 
     // the shared processes will be restarted in 5s
-    await delay(10000);
+    await sleep(10000);
 
     await assertLoginRequired(sessionRequest('/admin/users/start/1', 'POST', '', nobody));
     await assertRedirect(sessionRequest('/admin/users/start/1', 'POST', '', root, { followRedirects: false }), '/admin/users/search?q=1');