[Tests] update tests for more async/await cases

tape-testing · Jul 2, 2019 · 197019c · 197019c
1 parent f248610
commit 197019c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/test/async-await.js b/test/async-await.js
@@ -119,7 +119,7 @@ tap.test('async4', function (t) {
 
 tap.test('async5', function (t) {
     runProgram('async-await', 'async5.js', function (r) {
-        t.same(r.stdout.toString('utf8'), [
+        t.same(stripFullStack(r.stdout.toString('utf8')), [
             'TAP version 13',
             '# async5',
             'ok 1 before server',
@@ -128,14 +128,24 @@ tap.test('async5', function (t) {
             'ok 4 after request',
             'ok 5 should be equal',
             'ok 6 should be equal',
+            'ok 7 undefined',
+            'not ok 8 .end() called twice',
+            '  ---',
+            '    operator: fail',
+            '    at: Server.<anonymous> ($TEST/async-await/async5.js:$LINE:$COL)',
+            '    stack: |-',
+            '      Error: .end() called twice',
+            '          [... stack stripped ...]',
+            '          at Server.<anonymous> ($TEST/async-await/async5.js:$LINE:$COL)',
+            '          [... stack stripped ...]',
+            '  ...',
             '',
-            '1..6',
-            '# tests 6',
-            '# pass  6',
-            '',
-            '# ok'
+            '1..8',
+            '# tests 8',
+            '# pass  7',
+            '# fail  1'
         ].join('\n') + '\n\n');
-        t.same(r.exitCode, 0);
+        t.same(r.exitCode, 1);
         t.same(r.stderr.toString('utf8'), '');
         t.end();
     });

diff --git a/test/async-await/async1.js b/test/async-await/async1.js
@@ -7,6 +7,7 @@ test('async1', async function myTest(t) {
             setTimeout(resolve, 10);
         });
         t.ok(true, 'after await');
+        t.end();
     } catch (err) {
         t.ifError(err);
     }

diff --git a/test/async-await/async5.js b/test/async-await/async5.js
@@ -42,16 +42,14 @@ test('async5', async function myTest(t) {
         res.resume();
         t.equal(res.statusCode, 200);
 
-        await new Promise(function (resolve, reject) {
-            setTimeout(function () {
-                t.equal(mockDb.state, 'new');
+        setTimeout(function () {
+            t.equal(mockDb.state, 'new');
 
-                server.close(function (err) {
-                    if (err) { reject(err); }
-                    else { resolve(); }
-                });
-            }, 50);
-        });
+            server.close(function (err) {
+                t.ifError(err);
+                t.end();
+            });
+        }, 50);
     } catch (err) {
         t.ifError(err);
         t.end();