Test262: making "fs" module required.

diff --git a/test/fs/methods.t.js b/test/fs/methods.t.mjs
similarity index 95%
rename from test/fs/methods.t.js
rename to test/fs/methods.t.mjs
index 72afb49409fadfe62c57c20496113ec4c82812c5..9b695296c902866d280d4c74867a907ac60368c3 100644 (file)
--- a/test/fs/methods.t.js
+++ b/test/fs/methods.t.mjs
@@ -157,7 +157,7 @@ let readfile_tests = () => [
 
 let readFile_tsuite = {
     name: "fs readFile",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: readfile_test,
     prepare_args: p,
     opts: { type: "callback" },
@@ -166,7 +166,7 @@ let readFile_tsuite = {
 
 let readFileSync_tsuite = {
     name: "fs readFileSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: readfile_test,
     prepare_args: p,
     opts: { type: "sync" },
@@ -175,7 +175,7 @@ let readFileSync_tsuite = {
 
 let readFileP_tsuite = {
     name: "fsp readFile",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: readfile_test,
     prepare_args: p,
     opts: { type: "promise" },
@@ -246,7 +246,7 @@ let writefile_tests = () => [
 
 let writeFile_tsuite = {
     name: "fs writeFile",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: writefile_test,
     prepare_args: p,
     opts: { type: "callback" },
@@ -255,7 +255,7 @@ let writeFile_tsuite = {
 
 let writeFileSync_tsuite = {
     name: "fs writeFileSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: writefile_test,
     prepare_args: p,
     opts: { type: "sync" },
@@ -264,7 +264,7 @@ let writeFileSync_tsuite = {
 
 let writeFileP_tsuite = {
     name: "fsp writeFile",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: writefile_test,
     prepare_args: p,
     opts: { type: "promise" },
@@ -336,7 +336,7 @@ let append_tests = () => [
 
 let appendFile_tsuite = {
     name: "fs appendFile",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: append_test,
     prepare_args: p,
     opts: { type: "callback" },
@@ -345,7 +345,7 @@ let appendFile_tsuite = {
 
 let appendFileSync_tsuite = {
     name: "fs appendFileSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: append_test,
     prepare_args: p,
     opts: { type: "sync" },
@@ -354,7 +354,7 @@ let appendFileSync_tsuite = {
 
 let appendFileP_tsuite = {
     name: "fsp appendFile",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: append_test,
     prepare_args: p,
     opts: { type: "promise" },
@@ -384,7 +384,7 @@ let exists_tests = () => [
 
 let existsSync_tsuite = {
     name: "fs existsSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: exists_test,
     prepare_args: p,
     opts: { type: "sync" },
@@ -410,7 +410,7 @@ let realpath_tests = () => [
 
 let realpath_tsuite = {
     name: "fs realpath",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: realpath_test,
     prepare_args: p,
     opts: { type: "callback" },
@@ -419,7 +419,7 @@ let realpath_tsuite = {
 
 let realpathSync_tsuite = {
     name: "fs realpathSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: realpath_test,
     prepare_args: p,
     opts: { type: "sync" },
@@ -428,7 +428,7 @@ let realpathSync_tsuite = {
 
 let realpathP_tsuite = {
     name: "fsp realpath",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: realpath_test,
     prepare_args: p,
     opts: { type: "promise" },
@@ -460,7 +460,7 @@ let readlink_tests = () => [
 
 let readlink_tsuite = {
     name: "fs readlink",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: readlink_test,
     prepare_args: p,
     opts: { type: "callback" },
@@ -469,7 +469,7 @@ let readlink_tsuite = {
 
 let readlinkSync_tsuite = {
     name: "fs readlinkSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: readlink_test,
     prepare_args: p,
     opts: { type: "sync" },
@@ -478,7 +478,7 @@ let readlinkSync_tsuite = {
 
 let readlinkP_tsuite = {
     name: "fsp readlink",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: readlink_test,
     prepare_args: p,
     opts: { type: "promise" },
@@ -620,7 +620,7 @@ let stat_tests = () => [
 
 let stat_tsuite = {
     name: "fs stat",
-    skip: () => (!has_fs() || !has_fs_symbolic_link() || !has_buffer()),
+    skip: () => (!has_fs_symbolic_link() || !has_buffer()),
     T: method_test,
     prepare_args: p,
     opts: { type: "callback", method: "stat" },
@@ -629,7 +629,7 @@ let stat_tsuite = {
 
 let statSync_tsuite = {
     name: "fs statSync",
-    skip: () => (!has_fs() || !has_fs_symbolic_link() || !has_buffer()),
+    skip: () => (!has_fs_symbolic_link() || !has_buffer()),
     T: method_test,
     prepare_args: p,
     opts: { type: "sync", method: "stat" },
@@ -638,7 +638,7 @@ let statSync_tsuite = {
 
 let statP_tsuite = {
     name: "fsp stat",
-    skip: () => (!has_fs() || !has_fs_symbolic_link() || !has_buffer()),
+    skip: () => (!has_fs_symbolic_link() || !has_buffer()),
     T: method_test,
     prepare_args: p,
     opts: { type: "promise", method: "stat" },
@@ -647,7 +647,7 @@ let statP_tsuite = {
 
 let lstat_tsuite = {
     name: "fs lstat",
-    skip: () => (!has_fs() || !has_fs_symbolic_link() || !has_buffer()),
+    skip: () => (!has_fs_symbolic_link() || !has_buffer()),
     T: method_test,
     prepare_args: p,
     opts: { type: "callback", method: "lstat" },
@@ -656,7 +656,7 @@ let lstat_tsuite = {
 
 let lstatSync_tsuite = {
     name: "fs lstatSync",
-    skip: () => (!has_fs() || !has_fs_symbolic_link() || !has_buffer()),
+    skip: () => (!has_fs_symbolic_link() || !has_buffer()),
     T: method_test,
     prepare_args: p,
     opts: { type: "sync", method: "lstat" },
@@ -665,7 +665,7 @@ let lstatSync_tsuite = {
 
 let lstatP_tsuite = {
     name: "fsp lstat",
-    skip: () => (!has_fs() || !has_fs_symbolic_link() || !has_buffer()),
+    skip: () => (!has_fs_symbolic_link() || !has_buffer()),
     T: method_test,
     prepare_args: p,
     opts: { type: "promise", method: "lstat" },
@@ -770,7 +770,7 @@ let open_tests = () => [
 
 let openSync_tsuite = {
     name: "fs openSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: method_test,
     prepare_args: p,
     opts: { type: "sync", method: "open" },
@@ -779,7 +779,7 @@ let openSync_tsuite = {
 
 let openP_tsuite = {
     name: "fsp open",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: method_test,
     prepare_args: p,
     opts:  { type: "promise", method: "open" },
@@ -813,7 +813,7 @@ let close_tests = () => [
 
 let closeSync_tsuite = {
     name: "fs closeSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: method_test,
     prepare_args: p,
     opts: { type: "sync", method: "close" },
@@ -1005,7 +1005,7 @@ let read_tests = () => [
 
 let readSync_tsuite = {
     name: "fs readSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: read_test,
     prepare_args: p,
     opts: {},
@@ -1014,7 +1014,7 @@ let readSync_tsuite = {
 
 let readFh_tsuite = {
     name: "fh read",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: readFh_test,
     prepare_args: p,
     opts: {},
@@ -1210,7 +1210,7 @@ let write_tests = () => [
 
 let writeSync_tsuite = {
     name: "fs writeSync",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: write_test,
     prepare_args: p,
     opts: {},
@@ -1219,7 +1219,7 @@ let writeSync_tsuite = {
 
 let writeFh_tsuite = {
     name: "fh write",
-    skip: () => (!has_fs() || !has_buffer()),
+    skip: () => (!has_buffer()),
     T: writeFh_test,
     prepare_args: p,
     opts: {},

diff --git a/test/fs/promises_01.t.js b/test/fs/promises_01.t.mjs
similarity index 87%
rename from test/fs/promises_01.t.js
rename to test/fs/promises_01.t.mjs
index 69f0ce38f316919f27b974ff4a0a40b84df8d095..74628d45a208bb5842cb89fdadda3dd4fb703c09 100644 (file)
--- a/test/fs/promises_01.t.js
+++ b/test/fs/promises_01.t.mjs
@@ -41,10 +41,7 @@ let test = () => Promise.resolve()
 })
 
 let p = Promise.resolve()
-if (has_fs()) {
-    p = p
-        .then(test)
-        .then(() => assert.compareArray(stages, ["init", "short circut", "chain", "errors ok"]))
-}
+    .then(test)
+    .then(() => assert.compareArray(stages, ["init", "short circut", "chain", "errors ok"]))
 
 p.then($DONE, $DONE);

diff --git a/test/fs/promises_02.t.js b/test/fs/promises_02.t.mjs
similarity index 91%
rename from test/fs/promises_02.t.js
rename to test/fs/promises_02.t.mjs
index 604ac8ca32eec9a2dc5bca52d2a2436b4eb12f44..36cd480a8e10ef9e7435697e2abc1cfe11479c8e 100644 (file)
--- a/test/fs/promises_02.t.js
+++ b/test/fs/promises_02.t.mjs
@@ -80,12 +80,9 @@ let testFsp = () => Promise.resolve()
 })
 
 let p = Promise.resolve()
-if (has_fs()) {
-    p = p
-        .then(testSync)
-        .then(testCallback)
-        .then(testFsp)
-        .then(() => assert.compareArray(stages, ["testSync", "testCallback", "testPromise"]))
-}
+    .then(testSync)
+    .then(testCallback)
+    .then(testFsp)
+    .then(() => assert.compareArray(stages, ["testSync", "testCallback", "testPromise"]))
 
 p.then($DONE, $DONE);

diff --git a/test/fs/promises_03.t.js b/test/fs/promises_03.t.mjs
similarity index 92%
rename from test/fs/promises_03.t.js
rename to test/fs/promises_03.t.mjs
index 491d990395d9c9d033a05d53b298d52bf1f6c631..a5e2d07203c753493cfc5d033ce48752b06dd83a 100644 (file)
--- a/test/fs/promises_03.t.js
+++ b/test/fs/promises_03.t.mjs
@@ -94,12 +94,9 @@ let testFsp = () => Promise.resolve()
 })
 
 let p = Promise.resolve()
-if (has_fs()) {
-    p = p
-        .then(testSync)
-        .then(testCallback)
-        .then(testFsp)
-        .then(() => assert.compareArray(stages, ['unlinkSync', 'unlink', 'fsp.unlink']))
-}
+    .then(testSync)
+    .then(testCallback)
+    .then(testFsp)
+    .then(() => assert.compareArray(stages, ['unlinkSync', 'unlink', 'fsp.unlink']))
 
 p.then($DONE, $DONE);

diff --git a/test/fs/promises_04.t.js b/test/fs/promises_04.t.mjs
similarity index 99%
rename from test/fs/promises_04.t.js
rename to test/fs/promises_04.t.mjs
index 763e095496a1fcdeacbf80a2d92920aec9ecf773..396d48033852b9cfba4c65ed7574a27e0260953c 100644 (file)
--- a/test/fs/promises_04.t.js
+++ b/test/fs/promises_04.t.mjs
@@ -180,7 +180,7 @@ let testFsp = () => Promise.resolve()
 })
 
 let p = Promise.resolve()
-if (has_fs() && has_fs_symbolic_link()) {
+if (has_fs_symbolic_link()) {
     p = p
         .then(testSync)
         .then(testCallback)

diff --git a/test/fs/promises_05.t.js b/test/fs/promises_05.t.mjs
similarity index 95%
rename from test/fs/promises_05.t.js
rename to test/fs/promises_05.t.mjs
index e40dfb1f0b6544799589d1c0e68ae027fc18331e..1fe33be433cc3fcc1a9f7aa168996e0b3fe8499f 100644 (file)
--- a/test/fs/promises_05.t.js
+++ b/test/fs/promises_05.t.mjs
@@ -143,12 +143,9 @@ let testFsp = () => Promise.resolve()
 })
 
 let p = Promise.resolve()
-if (has_fs()) {
-    p = p
-        .then(testSync)
-        .then(testCallback)
-        .then(testFsp)
-        .then(() => assert.compareArray(stages, ['mkdirSync', 'mkdir', 'fsp.mkdir']))
-}
+    .then(testSync)
+    .then(testCallback)
+    .then(testFsp)
+    .then(() => assert.compareArray(stages, ['mkdirSync', 'mkdir', 'fsp.mkdir']))
 
 p.then($DONE, $DONE);

diff --git a/test/fs/promises_06.t.js b/test/fs/promises_06.t.mjs
similarity index 92%
rename from test/fs/promises_06.t.js
rename to test/fs/promises_06.t.mjs
index 91fdba01b2d37cb721ed883f302b8a15a412aaef..104b4a5b23d8ced4588737329e05ea73dc02e1ed 100644 (file)
--- a/test/fs/promises_06.t.js
+++ b/test/fs/promises_06.t.mjs
@@ -94,12 +94,9 @@ let testFsp = () => Promise.resolve()
 })
 
 let p = Promise.resolve()
-if (has_fs()) {
-    p = p
-        .then(testSync)
-        .then(testCallback)
-        .then(testFsp)
-        .then(() => assert.compareArray(stages, ["renameSync", "rename", "fsp.rename"]))
-}
+    .then(testSync)
+    .then(testCallback)
+    .then(testFsp)
+    .then(() => assert.compareArray(stages, ["renameSync", "rename", "fsp.rename"]))
 
 p.then($DONE, $DONE);

diff --git a/test/fs/promises_07.t.js b/test/fs/promises_07.t.mjs
similarity index 99%
rename from test/fs/promises_07.t.js
rename to test/fs/promises_07.t.mjs
index f32b11a5afff662f6a65de3b78ff985258369641..02b12a3ac3241571d4d0466f245c835b589a0d03 100644 (file)
--- a/test/fs/promises_07.t.js
+++ b/test/fs/promises_07.t.mjs
@@ -229,7 +229,7 @@ let testFsp = () => Promise.resolve()
 })
 
 let p = Promise.resolve()
-if (has_fs() && has_fs_symbolic_link()) {
+if (has_fs_symbolic_link()) {
     p = p
         .then(testSync)
         .then(testCallback)

diff --git a/test/fs/promises_08.t.js b/test/fs/promises_08.t.mjs
similarity index 94%
rename from test/fs/promises_08.t.js
rename to test/fs/promises_08.t.mjs
index cffa7c20782ec287ac780af8a161154e78c05cf8..d3efa820f736733480ee2e13fd491f38d337284f 100644 (file)
--- a/test/fs/promises_08.t.js
+++ b/test/fs/promises_08.t.mjs
@@ -78,10 +78,7 @@ var testSync = () => new Promise((resolve, reject) => {
 });
 
 let p = Promise.resolve()
-if (has_fs()) {
-    p = p
-        .then(testSync)
-        .then(() => assert.compareArray(stages, ["mkdirSync"]))
-}
+    .then(testSync)
+    .then(() => assert.compareArray(stages, ["mkdirSync"]))
 
 p.then($DONE, $DONE);

diff --git a/test/fs/promises_09.t.js b/test/fs/promises_09.t.mjs
similarity index 98%
rename from test/fs/promises_09.t.js
rename to test/fs/promises_09.t.mjs
index 91789eedf0bdb114f7ba2834ded3b7d532b4a283..480f54b532a6587ac10c476a1e86c7b5bfb1c7f8 100644 (file)
--- a/test/fs/promises_09.t.js
+++ b/test/fs/promises_09.t.mjs
@@ -101,7 +101,7 @@ var testSync = () => new Promise((resolve, reject) => {
 });
 
 let p = Promise.resolve()
-if (has_fs() && has_fs_symbolic_link()) {
+if (has_fs_symbolic_link()) {
     p = p
         .then(testSync)
         .then(() => assert.compareArray(stages, ['rmdirSync']))

diff --git a/test/harness/compatFs.js b/test/harness/compatFs.js
index dd96a5928be05922ac74991c8aa3282c38c1cf8b..911be46531c02a28e2bb8e746ac1c9ac08648df1 100644 (file)
--- a/test/harness/compatFs.js
+++ b/test/harness/compatFs.js
@@ -1,10 +1,5 @@
-let fs = null;
-let fsp = null;
-
-if (typeof require == 'function') {
-    fs = require('fs');
-    fsp = fs.promises;
-}
+import fs from 'fs';
+let fsp = fs.promises;
 
 if (typeof process == 'undefined') {
     globalThis.process = {};
@@ -13,14 +8,7 @@ if (typeof process == 'undefined') {
 let test_dir = process.env && process.env['NJS_TEST_DIR'] || 'build';
 test_dir = `${test_dir}/test`;
 
-function has_fs() {
-    return fs;
-}
-
 function has_fs_symbolic_link() {
-    if (!fs) {
-        return false;
-    }
 
     let fname = test_dir + '/a';
     let lname = test_dir + '/b';

diff --git a/test/webcrypto/aes.t.js b/test/webcrypto/aes.t.mjs
similarity index 98%
rename from test/webcrypto/aes.t.js
rename to test/webcrypto/aes.t.mjs
index 1f5c136f84637bf1d53725d7b11231c0838a0b73..80cddabb8f6b9d51c3e8e6c51b900574ae9da6c0 100644 (file)
--- a/test/webcrypto/aes.t.js
+++ b/test/webcrypto/aes.t.mjs
@@ -46,7 +46,7 @@ function p(args, default_opts) {
 
 let aes_tsuite = {
     name: "AES encoding/decoding",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {

diff --git a/test/webcrypto/aes_decoding.t.js b/test/webcrypto/aes_decoding.t.mjs
similarity index 97%
rename from test/webcrypto/aes_decoding.t.js
rename to test/webcrypto/aes_decoding.t.mjs
index c1aff369576540f5ef2735716caa942b20c95d0d..80eaf6429a5acb566b30f9e503987916e62e7bed 100644 (file)
--- a/test/webcrypto/aes_decoding.t.js
+++ b/test/webcrypto/aes_decoding.t.mjs
@@ -40,7 +40,7 @@ function p(args, default_opts) {
 
 let aes_tsuite = {
     name: "AES decoding",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {

diff --git a/test/webcrypto/derive.t.js b/test/webcrypto/derive.t.mjs
similarity index 98%
rename from test/webcrypto/derive.t.js
rename to test/webcrypto/derive.t.mjs
index 60a2188999b3125153968907291196b975b0f7cf..5ac1345917d53469a8c77c413c612dd376ced3ff 100644 (file)
--- a/test/webcrypto/derive.t.js
+++ b/test/webcrypto/derive.t.mjs
@@ -43,7 +43,7 @@ function p(args, default_opts) {
 
 let derive_tsuite = {
     name: "derive",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {

diff --git a/test/webcrypto/digest.t.js b/test/webcrypto/digest.t.mjs
similarity index 97%
rename from test/webcrypto/digest.t.js
rename to test/webcrypto/digest.t.mjs
index f6413348330cb23af6df7fde8a868e8cd83da4f5..4318fe16617d5379537d0e4e1f7277652d7e049f 100644 (file)
--- a/test/webcrypto/digest.t.js
+++ b/test/webcrypto/digest.t.mjs
@@ -22,7 +22,7 @@ function p(args) {
 
 let digest_tsuite = {
     name: "SHA digest",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: { },

diff --git a/test/webcrypto/export.t.js b/test/webcrypto/export.t.mjs
similarity index 99%
rename from test/webcrypto/export.t.js
rename to test/webcrypto/export.t.mjs
index 631b3fa60cee131af64c473e5b274df6724d9574..81b549dfbae43b3c00363dae0caee46b9d59df25 100644 (file)
--- a/test/webcrypto/export.t.js
+++ b/test/webcrypto/export.t.mjs
@@ -247,7 +247,7 @@ function validate_rsa_jwk(exp, params) {
 
 let rsa_tsuite = {
     name: "RSA exporting",
-    skip: () => (!has_fs() || !has_webcrypto()),
+    skip: () => (!has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {
@@ -368,7 +368,7 @@ function validate_ec_jwk(exp, params) {
 
 let ec_tsuite = {
     name: "EC exporting",
-    skip: () => (!has_fs() || !has_webcrypto()),
+    skip: () => (!has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {
@@ -430,7 +430,7 @@ function validate_hmac_jwk(exp, params) {
 
 let hmac_tsuite = {
     name: "HMAC exporting",
-    skip: () => (!has_fs() || !has_webcrypto()),
+    skip: () => (!has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {
@@ -515,7 +515,7 @@ function validate_aes_jwk(exp, params) {
 
 let aes_tsuite = {
     name: "AES exporting",
-    skip: () => (!has_fs() || !has_webcrypto()),
+    skip: () => (!has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {

diff --git a/test/webcrypto/rsa.t.js b/test/webcrypto/rsa.t.mjs
similarity index 98%
rename from test/webcrypto/rsa.t.js
rename to test/webcrypto/rsa.t.mjs
index b87a090947ea3601a3d2278ff237fb5a7f47fd7b..977537e06d5c115fc9cf65b90068ce5831f75457 100644 (file)
--- a/test/webcrypto/rsa.t.js
+++ b/test/webcrypto/rsa.t.mjs
@@ -99,7 +99,7 @@ function p(args, default_opts) {
 
 let rsa_tsuite = {
     name: "RSA-OAEP encoding/decoding",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {

diff --git a/test/webcrypto/rsa_decoding.t.js b/test/webcrypto/rsa_decoding.t.mjs
similarity index 95%
rename from test/webcrypto/rsa_decoding.t.js
rename to test/webcrypto/rsa_decoding.t.mjs
index 3253dabaf95d86d2423f1a645b8f623827c2e769..24733279967be91047e8332ec65b016f2c989d96 100644 (file)
--- a/test/webcrypto/rsa_decoding.t.js
+++ b/test/webcrypto/rsa_decoding.t.mjs
@@ -4,7 +4,7 @@ flags: [async]
 ---*/
 
 async function test(params) {
-    if (!has_fs() || !has_buffer() || !has_webcrypto()) {
+    if (!has_buffer() || !has_webcrypto()) {
         return 'SKIPPED';
     }
 

diff --git a/test/webcrypto/sign.t.js b/test/webcrypto/sign.t.mjs
similarity index 99%
rename from test/webcrypto/sign.t.js
rename to test/webcrypto/sign.t.mjs
index e35473c21050bbefd4e004b795232face0c7fad9..4fa78716c8363865e33f1d48c18836670d9a2ea8 100644 (file)
--- a/test/webcrypto/sign.t.js
+++ b/test/webcrypto/sign.t.mjs
@@ -153,7 +153,7 @@ function p(args, default_opts) {
 
 let hmac_tsuite = {
     name: "HMAC sign",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {
@@ -208,7 +208,7 @@ let hmac_tsuite = {
 
 let rsassa_pkcs1_v1_5_tsuite = {
     name: "RSASSA-PKCS1-v1_5 sign",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {
@@ -354,7 +354,7 @@ let rsassa_pkcs1_v1_5_tsuite = {
 
 let rsa_pss_tsuite = {
     name: "RSA-PSS sign",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {
@@ -397,7 +397,7 @@ let rsa_pss_tsuite = {
 
 let ecdsa_tsuite = {
     name: "ECDSA sign",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {

diff --git a/test/webcrypto/verify.t.js b/test/webcrypto/verify.t.mjs
similarity index 95%
rename from test/webcrypto/verify.t.js
rename to test/webcrypto/verify.t.mjs
index df3847247963f4e62c5e8766df1a5ba4982ffbfc..70f608f3b87d9c41ab03a8ae60da102a5822eeb2 100644 (file)
--- a/test/webcrypto/verify.t.js
+++ b/test/webcrypto/verify.t.mjs
@@ -53,7 +53,7 @@ function p(args, default_opts) {
 
 let hmac_tsuite = {
     name: "HMAC verify",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {
@@ -78,7 +78,7 @@ let hmac_tsuite = {
 
 let rsassa_pkcs1_v1_5_tsuite = {
     name: "RSASSA-PKCS1-v1_5 verify",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {
@@ -103,7 +103,7 @@ let rsassa_pkcs1_v1_5_tsuite = {
 
 let rsa_pss_tsuite = {
     name: "RSA-PSS verify",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {
@@ -133,7 +133,7 @@ let rsa_pss_tsuite = {
 
 let ecdsa_tsuite = {
     name: "ECDSA verify",
-    skip: () => (!has_fs() || !has_buffer() || !has_webcrypto()),
+    skip: () => (!has_buffer() || !has_webcrypto()),
     T: test,
     prepare_args: p,
     opts: {

diff --git a/test/xml/saml_verify.t.js b/test/xml/saml_verify.t.mjs
similarity index 99%
rename from test/xml/saml_verify.t.js
rename to test/xml/saml_verify.t.mjs
index be6bae82245e218d7869c1e5d73fb225ddb7fc13..875fbd40c4ce903673b420bcd50ed2ec70880b6d 100644 (file)
--- a/test/xml/saml_verify.t.js
+++ b/test/xml/saml_verify.t.mjs
@@ -280,7 +280,7 @@ function p(args, default_opts) {
 
 let saml_verify_tsuite = {
     name: "SAML verify",
-    skip: () => (!has_njs() || !has_fs() || !has_webcrypto() || !has_xml()),
+    skip: () => (!has_njs() || !has_webcrypto() || !has_xml()),
     T: verify,
     prepare_args: p,
     opts: {