Speed up 'dead' tests by adding bailouts, except for 'timeout' test c…

…ases
qunitjs · Jan 24, 2025 · 50c1cf4 · 50c1cf4
1 parent 1b8801a
commit 50c1cf4
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 49 deletions.
diff --git a/test/fixtures/console.html b/test/fixtures/console.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>console</title>
 <script>
 console.log('TAP version 13');
 

diff --git a/test/fixtures/fail-and-timeout.html b/test/fixtures/fail-and-timeout.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>timeout-fail</title>
 <script>
 console.log('TAP version 13');
 function delay(ms, fn) {

diff --git a/test/fixtures/fail-and-uncaught.html b/test/fixtures/fail-and-uncaught.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>uncaught-mid</title>
 <script>
 console.log('TAP version 13');
 console.log('ok 1 Foo bar');
@@ -14,4 +13,8 @@
 setTimeout(() => {
   bar(); // Uncaught ReferenceError
 }, 200);
+
+setTimeout(() => {
+  console.log('Bail out! End of fixture'); // Don't wait for timeout
+}, 300);
 </script>
diff --git a/test/fixtures/fail.html b/test/fixtures/fail.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>fail</title>
 <script>
 console.log('TAP version 13');
 console.log('ok 1 Foo bar');

diff --git a/test/fixtures/mocking.html b/test/fixtures/mocking.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>mocking</title>
 <script>
 window.XMLHttpRequest = function () {
   throw new Error('Oops, called mock XMLHttpRequest');

diff --git a/test/fixtures/pass.html b/test/fixtures/pass.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>pass</title>
 <script>
 console.log('TAP version 13');
 console.log('ok 1 Foo bar');

diff --git a/test/fixtures/skip.html b/test/fixtures/skip.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>skip</title>
 <script>
 console.log('TAP version 13');
 console.log('ok 1 Foo bar');

diff --git a/test/fixtures/slow.html b/test/fixtures/slow.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>slow</title>
 <script>
 function delay(ms, fn) {
   setTimeout(fn, ms);

diff --git a/test/fixtures/timeout.html b/test/fixtures/timeout.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>timeout</title>
 <script>
 console.log('TAP version 13');
 function delay(ms, fn) {
@@ -13,11 +12,6 @@
 
     delay(3200, () => {
       console.log('ok 3 Baz > another thing');
-
-      delay(4000, () => {
-        console.log('ok 4 Quux');
-        console.log('1..4');
-      });
     });
   });
 });

diff --git a/test/fixtures/todo.html b/test/fixtures/todo.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>todo</title>
 <script>
 console.log('TAP version 13');
 console.log('ok 1 Foo bar');

diff --git a/test/fixtures/uncaught-custom.html b/test/fixtures/uncaught-custom.html
@@ -1,5 +1,9 @@
 <!DOCTYPE html>
-<title>uncaught-custom</title>
 <script>
 throw { message: 'Boo' };
 </script>
+<script>
+setTimeout(function () {
+    console.log('Bail out! End of fixture'); // Don't wait for timeout
+});
+</script>
diff --git a/test/fixtures/uncaught-early.html b/test/fixtures/uncaught-early.html
@@ -1,5 +1,9 @@
 <!DOCTYPE html>
-<title>uncaught-early</title>
 <script>
 bar(); // Uncaught ReferenceError
 </script>
+<script>
+setTimeout(function () {
+    console.log('Bail out! End of fixture'); // Don't wait for timeout
+});
+</script>
diff --git a/test/fixtures/uncaught-late.html b/test/fixtures/uncaught-late.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<title>uncaught-late</title>
 <script>
 console.log('TAP version 13');
 function delay(ms, fn) {

diff --git a/test/fixtures/uncaught-mid.html b/test/fixtures/uncaught-mid.html
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
-<title>uncaught-mid</title>
 <script>
 console.log('TAP version 13');
 console.log('ok 1 Foo bar');
 bar(); // Uncaught ReferenceError
 </script>
+<script>
+setTimeout(function () {
+    console.log('Bail out! End of fixture'); // Don't wait for timeout
+});
+</script>
diff --git a/test/fixtures/uncaught-multiple.html b/test/fixtures/uncaught-multiple.html
@@ -1,8 +1,12 @@
 <!DOCTYPE html>
-<title>uncaught-multiple</title>
 <script>
 bar(); // Uncaught ReferenceError
 </script>
 <script>
 quux(); // Uncaught ReferenceError
 </script>
+<script>
+setTimeout(function () {
+    console.log('Bail out! End of fixture'); // Don't wait for timeout
+});
+</script>
diff --git a/test/qtap.test.js b/test/qtap.test.js
@@ -9,7 +9,7 @@ const __dirname = path.dirname(__filename);
 const root = path.join(__dirname, '..');
 const options = {
   root,
-  timeout: 2,
+  timeout: 30,
   verbose: !!process.env.CI,
   // verbose: true, // debugging
   printDebug: (str) => { console.error('# ' + str); }
@@ -55,11 +55,14 @@ QUnit.module('qtap', function () {
     },
     failAndTimeout: {
       files: 'test/fixtures/fail-and-timeout.html',
-      options,
+      options: {
+        ...options,
+        timeout: 5
+      },
       expected: [
         'client: running test/fixtures/fail-and-timeout.html',
         'online',
-        'bail: Browser idle for 2s',
+        'bail: Browser idle for 5s',
       ],
       exitCode: 1
     },
@@ -69,8 +72,8 @@ QUnit.module('qtap', function () {
       expected: [
         'client: running test/fixtures/fail-and-uncaught.html',
         'online',
-        'consoleerror: ReferenceError: bar is not defined\n  at /test/fixtures/fail-and-uncaught.html:15',
-        'bail: Browser idle for 2s',
+        'consoleerror: ReferenceError: bar is not defined\n  at /test/fixtures/fail-and-uncaught.html:14',
+        'bail: End of fixture',
       ],
       exitCode: 1
     },
@@ -109,10 +112,7 @@ QUnit.module('qtap', function () {
     },
     qunitPass: {
       files: 'test/fixtures/qunit-pass.html',
-      options: {
-        ...options,
-        timeout: 30,
-      },
+      options,
       expected: [
         'client: running test/fixtures/qunit-pass.html',
         'online',
@@ -122,10 +122,7 @@ QUnit.module('qtap', function () {
     },
     qunitNotests: {
       files: 'test/fixtures/qunit-notests.html',
-      options: {
-        ...options,
-        timeout: 30,
-      },
+      options,
       expected: [
         'client: running test/fixtures/qunit-notests.html',
         'online',
@@ -135,10 +132,7 @@ QUnit.module('qtap', function () {
     },
     qunitFail: {
       files: 'test/fixtures/qunit-fail.html',
-      options: {
-        ...options,
-        timeout: 30,
-      },
+      options,
       expected: [
         'client: running test/fixtures/qunit-fail.html',
         'online',
@@ -168,11 +162,14 @@ QUnit.module('qtap', function () {
     },
     timeout: {
       files: 'test/fixtures/timeout.html',
-      options,
+      options: {
+        ...options,
+        timeout: 5
+      },
       expected: [
         'client: running test/fixtures/timeout.html',
         'online',
-        'bail: Browser idle for 2s',
+        'bail: Browser idle for 5s',
       ],
       exitCode: 1
     },
@@ -192,8 +189,8 @@ QUnit.module('qtap', function () {
       expected: [
         'client: running test/fixtures/uncaught-early.html',
         'online',
-        'consoleerror: ReferenceError: bar is not defined\n  at /test/fixtures/uncaught-early.html:4',
-        'bail: Browser idle for 2s',
+        'consoleerror: ReferenceError: bar is not defined\n  at /test/fixtures/uncaught-early.html:3',
+        'bail: End of fixture',
       ],
       exitCode: 1
     },
@@ -203,8 +200,8 @@ QUnit.module('qtap', function () {
       expected: [
         'client: running test/fixtures/uncaught-mid.html',
         'online',
-        'consoleerror: ReferenceError: bar is not defined\n  at /test/fixtures/uncaught-mid.html:6',
-        'bail: Browser idle for 2s',
+        'consoleerror: ReferenceError: bar is not defined\n  at /test/fixtures/uncaught-mid.html:5',
+        'bail: End of fixture',
       ],
       exitCode: 1
     },
@@ -224,8 +221,8 @@ QUnit.module('qtap', function () {
       expected: [
         'client: running test/fixtures/uncaught-custom.html',
         'online',
-        'consoleerror: Error: Boo\n  at /test/fixtures/uncaught-custom.html:4',
-        'bail: Browser idle for 2s',
+        'consoleerror: Error: Boo\n  at /test/fixtures/uncaught-custom.html:3',
+        'bail: End of fixture',
       ],
       exitCode: 1
     },
@@ -235,14 +232,14 @@ QUnit.module('qtap', function () {
       expected: [
         'client: running test/fixtures/uncaught-multiple.html',
         'online',
-        'consoleerror: ReferenceError: bar is not defined\n  at /test/fixtures/uncaught-multiple.html:4'
-          + '\nReferenceError: quux is not defined\n  at /test/fixtures/uncaught-multiple.html:7',
-        'bail: Browser idle for 2s',
+        'consoleerror: ReferenceError: bar is not defined\n  at /test/fixtures/uncaught-multiple.html:3'
+          + '\nReferenceError: quux is not defined\n  at /test/fixtures/uncaught-multiple.html:6',
+        'bail: End of fixture',
       ],
       exitCode: 1
     },
   }, async function (assert, params) {
-    assert.timeout(10_000);
+    assert.timeout(40_000);
 
     const run = qtap.run(
       'firefox',