From df1f3005cfcb3ea9fb7c89b8e756c18c53b65abc Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Tue, 21 Nov 2023 17:08:27 -0800 Subject: [PATCH] Fs conformance (#268) * fix test formatting * conformance * flags * more cases * regen * more cases * fmt * fixup --- packages/preview2-shim/lib/io/worker-io.js | 8 +- .../preview2-shim/lib/nodejs/filesystem.js | 141 +++++++++++++----- packages/preview2-shim/lib/synckit/index.js | 4 +- submodules/wasmtime | 2 +- tests/generated/api_proxy.rs | 2 + tests/generated/api_proxy_streaming.rs | 2 + tests/generated/api_reactor.rs | 2 + tests/generated/api_read_only.rs | 6 +- tests/generated/api_time.rs | 2 + tests/generated/cli_args.rs | 2 + tests/generated/cli_default_clocks.rs | 2 + tests/generated/cli_directory_list.rs | 2 + tests/generated/cli_env.rs | 2 + tests/generated/cli_exit_default.rs | 2 + tests/generated/cli_exit_failure.rs | 2 + tests/generated/cli_exit_panic.rs | 2 + tests/generated/cli_exit_success.rs | 2 + tests/generated/cli_export_cabi_realloc.rs | 2 + tests/generated/cli_file_append.rs | 2 + tests/generated/cli_file_dir_sync.rs | 2 + tests/generated/cli_file_read.rs | 2 + tests/generated/cli_hello_stdout.rs | 2 + tests/generated/cli_splice_stdin.rs | 2 + tests/generated/cli_stdin.rs | 2 + tests/generated/cli_stdio_write_flushes.rs | 2 + .../http_outbound_request_content_length.rs | 2 + tests/generated/http_outbound_request_get.rs | 2 + .../http_outbound_request_invalid_dnsname.rs | 2 + .../http_outbound_request_invalid_header.rs | 2 + .../http_outbound_request_invalid_port.rs | 2 + .../http_outbound_request_invalid_version.rs | 2 + .../http_outbound_request_large_post.rs | 2 + tests/generated/http_outbound_request_post.rs | 2 + tests/generated/http_outbound_request_put.rs | 2 + .../http_outbound_request_response_build.rs | 2 + .../http_outbound_request_unknown_method.rs | 2 + ...ttp_outbound_request_unsupported_scheme.rs | 2 + tests/generated/preview1_big_random_buf.rs | 4 +- tests/generated/preview1_clock_time_get.rs | 4 +- tests/generated/preview1_close_preopen.rs | 2 + tests/generated/preview1_dangling_fd.rs | 2 + tests/generated/preview1_dangling_symlink.rs | 2 + .../generated/preview1_dir_fd_op_failures.rs | 4 +- tests/generated/preview1_directory_seek.rs | 4 +- tests/generated/preview1_fd_advise.rs | 4 +- tests/generated/preview1_fd_filestat_get.rs | 4 +- tests/generated/preview1_fd_filestat_set.rs | 4 +- tests/generated/preview1_fd_flags_set.rs | 4 +- tests/generated/preview1_fd_readdir.rs | 4 +- tests/generated/preview1_file_allocate.rs | 4 +- tests/generated/preview1_file_pread_pwrite.rs | 4 +- tests/generated/preview1_file_seek_tell.rs | 4 +- tests/generated/preview1_file_truncation.rs | 4 +- .../preview1_file_unbuffered_write.rs | 4 +- tests/generated/preview1_file_write.rs | 4 +- tests/generated/preview1_interesting_paths.rs | 4 +- tests/generated/preview1_nofollow_errors.rs | 4 +- tests/generated/preview1_overwrite_preopen.rs | 4 +- tests/generated/preview1_path_exists.rs | 4 +- tests/generated/preview1_path_filestat.rs | 4 +- tests/generated/preview1_path_link.rs | 4 +- .../preview1_path_open_create_existing.rs | 4 +- .../preview1_path_open_dirfd_not_dir.rs | 4 +- tests/generated/preview1_path_open_missing.rs | 4 +- .../generated/preview1_path_open_nonblock.rs | 4 +- tests/generated/preview1_path_open_preopen.rs | 4 +- .../preview1_path_open_read_write.rs | 18 ++- tests/generated/preview1_path_rename.rs | 4 +- ...eview1_path_rename_dir_trailing_slashes.rs | 4 +- ...view1_path_rename_file_trailing_slashes.rs | 4 +- .../preview1_path_symlink_trailing_slashes.rs | 4 +- tests/generated/preview1_poll_oneoff_files.rs | 4 +- tests/generated/preview1_poll_oneoff_stdio.rs | 4 +- tests/generated/preview1_readlink.rs | 4 +- .../generated/preview1_regular_file_isatty.rs | 4 +- tests/generated/preview1_remove_directory.rs | 4 +- ...view1_remove_directory_trailing_slashes.rs | 4 +- .../preview1_remove_nonempty_directory.rs | 4 +- tests/generated/preview1_renumber.rs | 4 +- tests/generated/preview1_sched_yield.rs | 4 +- tests/generated/preview1_stdio.rs | 4 +- tests/generated/preview1_stdio_isatty.rs | 4 +- tests/generated/preview1_stdio_not_isatty.rs | 2 + tests/generated/preview1_symlink_create.rs | 4 +- tests/generated/preview1_symlink_filestat.rs | 4 +- tests/generated/preview1_symlink_loop.rs | 4 +- tests/generated/preview1_unicode_output.rs | 4 +- .../preview1_unlink_file_trailing_slashes.rs | 4 +- tests/generated/preview2_ip_name_lookup.rs | 2 + tests/generated/preview2_random.rs | 2 + tests/generated/preview2_sleep.rs | 2 + .../preview2_stream_pollable_correct.rs | 2 + .../preview2_stream_pollable_traps.rs | 2 + tests/generated/preview2_tcp_bind.rs | 2 + tests/generated/preview2_tcp_connect.rs | 2 + .../preview2_tcp_sample_application.rs | 2 + tests/generated/preview2_tcp_sockopts.rs | 2 + tests/generated/preview2_tcp_states.rs | 2 + tests/generated/preview2_udp_bind.rs | 2 + tests/generated/preview2_udp_connect.rs | 2 + .../preview2_udp_sample_application.rs | 2 + tests/generated/preview2_udp_sockopts.rs | 2 + tests/generated/preview2_udp_states.rs | 2 + tests/virtualenvs/scratch.js | 7 +- xtask/src/generate/tests.rs | 25 ++-- 105 files changed, 392 insertions(+), 105 deletions(-) diff --git a/packages/preview2-shim/lib/io/worker-io.js b/packages/preview2-shim/lib/io/worker-io.js index c3ab6557f..c653ed8ed 100644 --- a/packages/preview2-shim/lib/io/worker-io.js +++ b/packages/preview2-shim/lib/io/worker-io.js @@ -269,6 +269,9 @@ class Pollable { this.#ready = true; } } + static _getId(pollable) { + return pollable.#id; + } static _create(id) { const pollable = new Pollable(); pollable.#id = id; @@ -292,12 +295,15 @@ delete Pollable._listToIds; const pollableMarkReady = Pollable._markReady; delete Pollable._markReady; +const pollableGetId = Pollable._getId; +delete Pollable._getId; + export const poll = { Pollable, poll(list) { const includeList = ioCall(POLL_POLL_LIST, null, pollableListToIds(list)); return list.filter((pollable) => { - if (includeList.includes(pollable.id)) { + if (includeList.includes(pollableGetId(pollable))) { pollableMarkReady(pollable); return true; } diff --git a/packages/preview2-shim/lib/nodejs/filesystem.js b/packages/preview2-shim/lib/nodejs/filesystem.js index 340e2acbf..93514a556 100644 --- a/packages/preview2-shim/lib/nodejs/filesystem.js +++ b/packages/preview2-shim/lib/nodejs/filesystem.js @@ -12,15 +12,22 @@ import { fdatasyncSync, fstatSync, fsyncSync, + ftruncateSync, + futimesSync, + linkSync, lstatSync, + lutimesSync, mkdirSync, opendirSync, openSync, + readlinkSync, readSync, + renameSync, rmdirSync, statSync, symlinkSync, unlinkSync, + utimesSync, writeSync, } from "node:fs"; import { platform } from "node:process"; @@ -57,17 +64,22 @@ let descriptorCnt = 3; class Descriptor { #hostPreopen; #fd; + #mode; #fullPath; static _createPreopen(hostPreopen) { const descriptor = new Descriptor(); - descriptor.#hostPreopen = hostPreopen; + descriptor.#hostPreopen = hostPreopen.endsWith("/") + ? hostPreopen.slice(0, -1) || '/' + : hostPreopen; return descriptor; } - static _create(fd, fullPath) { + static _create(fd, mode, fullPath) { const descriptor = new Descriptor(); descriptor.#fd = fd; + descriptor.#mode = mode; + if (fullPath.endsWith("/")) throw new Error("bad full path"); descriptor.#fullPath = fullPath; return descriptor; } @@ -113,22 +125,7 @@ class Descriptor { getFlags() { if (this.#hostPreopen) throw "invalid"; - let stats; - try { - stats = fstatSync(this.#fd); - } catch (e) { - throw convertFsError(e); - } - const mode = stats.mode; - return { - read: ((mode & constants.O_RDWR) | (mode & constants.O_RDONLY)) > 0, - write: ((mode & constants.O_RDWR) | (mode & constants.O_WRONLY)) > 0, - // TODO: - fileIntegritySync: false, - dataIntegritySync: false, - requestedWriteSync: false, - mutateDirectory: false, - }; + return this.#mode; } getType() { @@ -139,17 +136,46 @@ class Descriptor { setSize(size) { if (this.#hostPreopen) throw "is-directory"; - console.log(`[filesystem] SET SIZE`, this._id, size); + try { + ftruncateSync(this.#fd, Number(size)); + } catch (e) { + throw convertFsError(e); + } } setTimes(dataAccessTimestamp, dataModificationTimestamp) { if (this.#hostPreopen) throw "invalid"; - console.log( - `[filesystem] SET TIMES`, - this._id, + let stats; + if ( + dataAccessTimestamp.tag === "no-change" || + dataModificationTimestamp.tag === "no-change" + ) + stats = this.stat(); + const atime = this.#getNewTimestamp( dataAccessTimestamp, - dataModificationTimestamp + dataAccessTimestamp.tag === "no-change" && stats.dataAccessTimestamp ); + const mtime = this.#getNewTimestamp( + dataModificationTimestamp, + dataModificationTimestamp.tag === "no-change" && + stats.dataModificationTimestamp + ); + try { + futimesSync(this.#fd, atime, mtime); + } catch (e) { + throw convertFsError(e); + } + } + + #getNewTimestamp(newTimestamp, maybeNow) { + switch (newTimestamp.tag) { + case "no-change": + return timestampToMs(maybeNow); + case "now": + return Math.floor(Date.now() / 1e3); + case "timestamp": + return timestampToMs(newTimestamp.val); + } } read(length, offset) { @@ -238,12 +264,42 @@ class Descriptor { }; } - setTimesAt() { - console.log(`[filesystem] SET TIMES AT`, this._id); + setTimesAt(pathFlags, path, dataAccessTimestamp, dataModificationTimestamp) { + const fullPath = this.#getFullPath(path, false); + let stats; + if ( + dataAccessTimestamp.tag === "no-change" || + dataModificationTimestamp.tag === "no-change" + ) + stats = this.stat(); + const atime = this.#getNewTimestamp( + dataAccessTimestamp, + dataAccessTimestamp.tag === "no-change" && stats.dataAccessTimestamp + ); + const mtime = this.#getNewTimestamp( + dataModificationTimestamp, + dataModificationTimestamp.tag === "no-change" && + stats.dataModificationTimestamp + ); + try { + (pathFlags.symlinkFollow ? utimesSync : lutimesSync)( + fullPath, + atime, + mtime + ); + } catch (e) { + throw convertFsError(e); + } } - linkAt() { - console.log(`[filesystem] LINK AT`, this._id); + linkAt(oldPathFlags, oldPath, newDescriptor, newPath) { + const oldFullPath = this.#getFullPath(oldPath, oldPathFlags.symlinkFollow); + const newFullPath = newDescriptor.#getFullPath(newPath, false); + try { + linkSync(oldFullPath, newFullPath); + } catch (e) { + throw convertFsError(e); + } } openAt(pathFlags, path, openFlags, descriptorFlags) { @@ -269,14 +325,19 @@ class Descriptor { isWindows ? fullPath.slice(1) : fullPath, fsOpenFlags ); - return descriptorCreate(fd, fullPath, preopenEntries); + return descriptorCreate(fd, descriptorFlags, fullPath, preopenEntries); } catch (e) { throw convertFsError(e); } } - readlinkAt() { - console.log(`[filesystem] READLINK AT`, this._id); + readlinkAt(path) { + const fullPath = this.#getFullPath(path, false); + try { + return readlinkSync(fullPath); + } catch (e) { + throw convertFsError(e); + } } removeDirectoryAt(path) { @@ -288,8 +349,14 @@ class Descriptor { } } - renameAt() { - console.log(`[filesystem] RENAME AT`, this._id); + renameAt(oldPath, newDescriptor, newPath) { + const oldFullPath = this.#getFullPath(oldPath, false); + const newFullPath = newDescriptor.#getFullPath(newPath, false); + try { + renameSync(oldFullPath, newFullPath); + } catch (e) { + throw convertFsError(e); + } } symlinkAt(target, path) { @@ -361,11 +428,9 @@ class Descriptor { subpath = subpath.slice(subpath[1] === "/" ? 2 : 1); if (descriptor.#hostPreopen) return ( - descriptor.#hostPreopen + - (descriptor.#hostPreopen.endsWith("/") ? "" : "/") + - subpath + descriptor.#hostPreopen + (subpath.length > 0 ? "/" : "") + subpath ); - return descriptor.#fullPath + (subpath.length > 0 ? "/" : '') + subpath; + return descriptor.#fullPath + (subpath.length > 0 ? "/" : "") + subpath; } [symbolDispose]() { @@ -516,3 +581,7 @@ function convertFsError(e) { throw e; } } + +function timestampToMs(timestamp) { + return Number(timestamp.seconds) * 1000 + timestamp.nanoseconds / 1e9; +} diff --git a/packages/preview2-shim/lib/synckit/index.js b/packages/preview2-shim/lib/synckit/index.js index 025a477b1..4394ab9b1 100644 --- a/packages/preview2-shim/lib/synckit/index.js +++ b/packages/preview2-shim/lib/synckit/index.js @@ -98,7 +98,9 @@ function startWorkerThread( throw new Error(`Internal error: Expected id ${id} but got id ${id2}`); } if (error) { - throw Object.assign(error, properties); + if (error instanceof Error) + throw Object.assign(error, properties); + throw error; } return result; }; diff --git a/submodules/wasmtime b/submodules/wasmtime index 3068d372b..d1ee4e478 160000 --- a/submodules/wasmtime +++ b/submodules/wasmtime @@ -1 +1 @@ -Subproject commit 3068d372ba446be77e9602d5294bf9a19bb9cd90 +Subproject commit d1ee4e47836a6528cb66b7a8de1746cda7612814 diff --git a/tests/generated/api_proxy.rs b/tests/generated/api_proxy.rs index 43dd75a59..8fa8f30c6 100644 --- a/tests/generated/api_proxy.rs +++ b/tests/generated/api_proxy.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn api_proxy() -> anyhow::Result<()> { let file_name = "api_proxy"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/api_proxy"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/api_proxy --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/api_proxy_streaming.rs b/tests/generated/api_proxy_streaming.rs index 36fee1e04..bac9b2cd6 100644 --- a/tests/generated/api_proxy_streaming.rs +++ b/tests/generated/api_proxy_streaming.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn api_proxy_streaming() -> anyhow::Result<()> { let file_name = "api_proxy_streaming"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/api_proxy_streaming"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/api_proxy_streaming --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/api_reactor.rs b/tests/generated/api_reactor.rs index f35924d23..9ee427b5a 100644 --- a/tests/generated/api_reactor.rs +++ b/tests/generated/api_reactor.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn api_reactor() -> anyhow::Result<()> { let file_name = "api_reactor"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/api_reactor"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/api_reactor --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/api_read_only.rs b/tests/generated/api_read_only.rs index 11ccf1462..83c6b6ed9 100644 --- a/tests/generated/api_read_only.rs +++ b/tests/generated/api_read_only.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; // use tempdir::TempDir; // use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn api_read_only() -> anyhow::Result<()> { // let file_name = "api_read_only"; // let tempdir = TempDir::new("{file_name}")?; // let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - panic!("skipped"); // cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/api_read_only --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; - // Ok(()) + let _ = fs::remove_dir_all("./tests/rundir/api_read_only"); + // cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/api_read_only --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + panic!("skipped"); // Ok(()) } diff --git a/tests/generated/api_time.rs b/tests/generated/api_time.rs index 89eaae533..7804809eb 100644 --- a/tests/generated/api_time.rs +++ b/tests/generated/api_time.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn api_time() -> anyhow::Result<()> { let file_name = "api_time"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/api_time"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/api_time --jco-import ./tests/virtualenvs/fakeclocks.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_args.rs b/tests/generated/cli_args.rs index bd0ed5865..7bf349567 100644 --- a/tests/generated/cli_args.rs +++ b/tests/generated/cli_args.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_args() -> anyhow::Result<()> { let file_name = "cli_args"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_args"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_args --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_default_clocks.rs b/tests/generated/cli_default_clocks.rs index 832f7469f..ccffefbe7 100644 --- a/tests/generated/cli_default_clocks.rs +++ b/tests/generated/cli_default_clocks.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_default_clocks() -> anyhow::Result<()> { let file_name = "cli_default_clocks"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_default_clocks"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_default_clocks --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_directory_list.rs b/tests/generated/cli_directory_list.rs index 3b26c70d1..47d2bdca6 100644 --- a/tests/generated/cli_directory_list.rs +++ b/tests/generated/cli_directory_list.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_directory_list() -> anyhow::Result<()> { let file_name = "cli_directory_list"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_directory_list"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_directory_list --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_env.rs b/tests/generated/cli_env.rs index 79020e6e5..83b33d0fd 100644 --- a/tests/generated/cli_env.rs +++ b/tests/generated/cli_env.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_env() -> anyhow::Result<()> { let file_name = "cli_env"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_env"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_env --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_exit_default.rs b/tests/generated/cli_exit_default.rs index 92c2fb222..1a2620d7a 100644 --- a/tests/generated/cli_exit_default.rs +++ b/tests/generated/cli_exit_default.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_exit_default() -> anyhow::Result<()> { let file_name = "cli_exit_default"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_exit_default"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_exit_default --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_exit_failure.rs b/tests/generated/cli_exit_failure.rs index 0b98cfd77..09d950ca1 100644 --- a/tests/generated/cli_exit_failure.rs +++ b/tests/generated/cli_exit_failure.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_exit_failure() -> anyhow::Result<()> { let file_name = "cli_exit_failure"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_exit_failure"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_exit_failure --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run().expect_err("test should exit with code 1"); Ok(()) } diff --git a/tests/generated/cli_exit_panic.rs b/tests/generated/cli_exit_panic.rs index 3d18fb48d..61acab4c2 100644 --- a/tests/generated/cli_exit_panic.rs +++ b/tests/generated/cli_exit_panic.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_exit_panic() -> anyhow::Result<()> { let file_name = "cli_exit_panic"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_exit_panic"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_exit_panic --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run().expect_err("test should exit with code 1"); Ok(()) } diff --git a/tests/generated/cli_exit_success.rs b/tests/generated/cli_exit_success.rs index 427a8125e..42a74ae65 100644 --- a/tests/generated/cli_exit_success.rs +++ b/tests/generated/cli_exit_success.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_exit_success() -> anyhow::Result<()> { let file_name = "cli_exit_success"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_exit_success"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_exit_success --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_export_cabi_realloc.rs b/tests/generated/cli_export_cabi_realloc.rs index 6a2d214eb..5006a7384 100644 --- a/tests/generated/cli_export_cabi_realloc.rs +++ b/tests/generated/cli_export_cabi_realloc.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_export_cabi_realloc() -> anyhow::Result<()> { let file_name = "cli_export_cabi_realloc"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_export_cabi_realloc"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_export_cabi_realloc --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_file_append.rs b/tests/generated/cli_file_append.rs index 509cfbf1e..a59b5d0be 100644 --- a/tests/generated/cli_file_append.rs +++ b/tests/generated/cli_file_append.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_file_append() -> anyhow::Result<()> { let file_name = "cli_file_append"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_file_append"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_file_append --jco-import ./tests/virtualenvs/bar-jabberwock.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_file_dir_sync.rs b/tests/generated/cli_file_dir_sync.rs index 215dd8477..0716394a2 100644 --- a/tests/generated/cli_file_dir_sync.rs +++ b/tests/generated/cli_file_dir_sync.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_file_dir_sync() -> anyhow::Result<()> { let file_name = "cli_file_dir_sync"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_file_dir_sync"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_file_dir_sync --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_file_read.rs b/tests/generated/cli_file_read.rs index 2212bfb31..f2912e946 100644 --- a/tests/generated/cli_file_read.rs +++ b/tests/generated/cli_file_read.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_file_read() -> anyhow::Result<()> { let file_name = "cli_file_read"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_file_read"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_file_read --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_hello_stdout.rs b/tests/generated/cli_hello_stdout.rs index cd69a72d1..3d3dc7634 100644 --- a/tests/generated/cli_hello_stdout.rs +++ b/tests/generated/cli_hello_stdout.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_hello_stdout() -> anyhow::Result<()> { let file_name = "cli_hello_stdout"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_hello_stdout"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_hello_stdout --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_splice_stdin.rs b/tests/generated/cli_splice_stdin.rs index 862a58ad5..3f19a6f42 100644 --- a/tests/generated/cli_splice_stdin.rs +++ b/tests/generated/cli_splice_stdin.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_splice_stdin() -> anyhow::Result<()> { let file_name = "cli_splice_stdin"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_splice_stdin"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_splice_stdin --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_stdin.rs b/tests/generated/cli_stdin.rs index 2fa3ff8c6..e41c9d9c2 100644 --- a/tests/generated/cli_stdin.rs +++ b/tests/generated/cli_stdin.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_stdin() -> anyhow::Result<()> { let file_name = "cli_stdin"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_stdin"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_stdin --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/cli_stdio_write_flushes.rs b/tests/generated/cli_stdio_write_flushes.rs index 11a1cba2f..dd10b6ebb 100644 --- a/tests/generated/cli_stdio_write_flushes.rs +++ b/tests/generated/cli_stdio_write_flushes.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn cli_stdio_write_flushes() -> anyhow::Result<()> { let file_name = "cli_stdio_write_flushes"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/cli_stdio_write_flushes"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/cli_stdio_write_flushes --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_content_length.rs b/tests/generated/http_outbound_request_content_length.rs index 7593b838d..38c8e9ad0 100644 --- a/tests/generated/http_outbound_request_content_length.rs +++ b/tests/generated/http_outbound_request_content_length.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_content_length() -> anyhow::Result<()> { let file_name = "http_outbound_request_content_length"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_content_length"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_content_length --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_get.rs b/tests/generated/http_outbound_request_get.rs index 624dba8ec..73d7438c5 100644 --- a/tests/generated/http_outbound_request_get.rs +++ b/tests/generated/http_outbound_request_get.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_get() -> anyhow::Result<()> { let file_name = "http_outbound_request_get"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_get"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_get --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_invalid_dnsname.rs b/tests/generated/http_outbound_request_invalid_dnsname.rs index 52429e1cd..afb667fee 100644 --- a/tests/generated/http_outbound_request_invalid_dnsname.rs +++ b/tests/generated/http_outbound_request_invalid_dnsname.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_invalid_dnsname() -> anyhow::Result<()> { let file_name = "http_outbound_request_invalid_dnsname"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_invalid_dnsname"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_invalid_dnsname --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_invalid_header.rs b/tests/generated/http_outbound_request_invalid_header.rs index 06ed752d4..5f492534b 100644 --- a/tests/generated/http_outbound_request_invalid_header.rs +++ b/tests/generated/http_outbound_request_invalid_header.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_invalid_header() -> anyhow::Result<()> { let file_name = "http_outbound_request_invalid_header"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_invalid_header"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_invalid_header --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_invalid_port.rs b/tests/generated/http_outbound_request_invalid_port.rs index 3da57226f..81c687d52 100644 --- a/tests/generated/http_outbound_request_invalid_port.rs +++ b/tests/generated/http_outbound_request_invalid_port.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_invalid_port() -> anyhow::Result<()> { let file_name = "http_outbound_request_invalid_port"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_invalid_port"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_invalid_port --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_invalid_version.rs b/tests/generated/http_outbound_request_invalid_version.rs index 47037748b..ce2c9cdc9 100644 --- a/tests/generated/http_outbound_request_invalid_version.rs +++ b/tests/generated/http_outbound_request_invalid_version.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_invalid_version() -> anyhow::Result<()> { let file_name = "http_outbound_request_invalid_version"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_invalid_version"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_invalid_version --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_large_post.rs b/tests/generated/http_outbound_request_large_post.rs index d03b596e2..e709ab87f 100644 --- a/tests/generated/http_outbound_request_large_post.rs +++ b/tests/generated/http_outbound_request_large_post.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_large_post() -> anyhow::Result<()> { let file_name = "http_outbound_request_large_post"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_large_post"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_large_post --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_post.rs b/tests/generated/http_outbound_request_post.rs index 8683357fa..fce263ea6 100644 --- a/tests/generated/http_outbound_request_post.rs +++ b/tests/generated/http_outbound_request_post.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_post() -> anyhow::Result<()> { let file_name = "http_outbound_request_post"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_post"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_post --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_put.rs b/tests/generated/http_outbound_request_put.rs index af7fd3c91..5410fbd47 100644 --- a/tests/generated/http_outbound_request_put.rs +++ b/tests/generated/http_outbound_request_put.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_put() -> anyhow::Result<()> { let file_name = "http_outbound_request_put"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_put"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_put --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_response_build.rs b/tests/generated/http_outbound_request_response_build.rs index d2347fc29..6c945b4bb 100644 --- a/tests/generated/http_outbound_request_response_build.rs +++ b/tests/generated/http_outbound_request_response_build.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_response_build() -> anyhow::Result<()> { let file_name = "http_outbound_request_response_build"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_response_build"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_response_build --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_unknown_method.rs b/tests/generated/http_outbound_request_unknown_method.rs index 1cdc739e1..12be199c2 100644 --- a/tests/generated/http_outbound_request_unknown_method.rs +++ b/tests/generated/http_outbound_request_unknown_method.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_unknown_method() -> anyhow::Result<()> { let file_name = "http_outbound_request_unknown_method"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_unknown_method"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_unknown_method --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/http_outbound_request_unsupported_scheme.rs b/tests/generated/http_outbound_request_unsupported_scheme.rs index f242e8e39..9e136f6a2 100644 --- a/tests/generated/http_outbound_request_unsupported_scheme.rs +++ b/tests/generated/http_outbound_request_unsupported_scheme.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn http_outbound_request_unsupported_scheme() -> anyhow::Result<()> { let file_name = "http_outbound_request_unsupported_scheme"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/http_outbound_request_unsupported_scheme"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/http_outbound_request_unsupported_scheme --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_big_random_buf.rs b/tests/generated/preview1_big_random_buf.rs index 4df4cf868..ceeeb94c4 100644 --- a/tests/generated/preview1_big_random_buf.rs +++ b/tests/generated/preview1_big_random_buf.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_big_random_buf() -> anyhow::Result<()> { let file_name = "preview1_big_random_buf"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_big_random_buf --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_big_random_buf"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_big_random_buf --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_clock_time_get.rs b/tests/generated/preview1_clock_time_get.rs index 734134d7f..8e6050a1e 100644 --- a/tests/generated/preview1_clock_time_get.rs +++ b/tests/generated/preview1_clock_time_get.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_clock_time_get() -> anyhow::Result<()> { let file_name = "preview1_clock_time_get"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_clock_time_get --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_clock_time_get"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_clock_time_get --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_close_preopen.rs b/tests/generated/preview1_close_preopen.rs index e7d388d31..77a18188c 100644 --- a/tests/generated/preview1_close_preopen.rs +++ b/tests/generated/preview1_close_preopen.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_close_preopen() -> anyhow::Result<()> { let file_name = "preview1_close_preopen"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_close_preopen"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_close_preopen --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_dangling_fd.rs b/tests/generated/preview1_dangling_fd.rs index 28ae9d1a7..0d897cb94 100644 --- a/tests/generated/preview1_dangling_fd.rs +++ b/tests/generated/preview1_dangling_fd.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_dangling_fd() -> anyhow::Result<()> { let file_name = "preview1_dangling_fd"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_dangling_fd"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_dangling_fd --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_dangling_symlink.rs b/tests/generated/preview1_dangling_symlink.rs index c21adc801..293d70900 100644 --- a/tests/generated/preview1_dangling_symlink.rs +++ b/tests/generated/preview1_dangling_symlink.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_dangling_symlink() -> anyhow::Result<()> { let file_name = "preview1_dangling_symlink"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_dangling_symlink"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_dangling_symlink --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_dir_fd_op_failures.rs b/tests/generated/preview1_dir_fd_op_failures.rs index 165c6d504..d4d992854 100644 --- a/tests/generated/preview1_dir_fd_op_failures.rs +++ b/tests/generated/preview1_dir_fd_op_failures.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_dir_fd_op_failures() -> anyhow::Result<()> { let file_name = "preview1_dir_fd_op_failures"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_dir_fd_op_failures --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_dir_fd_op_failures"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_dir_fd_op_failures --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_directory_seek.rs b/tests/generated/preview1_directory_seek.rs index 1bf0839b7..f7f92b325 100644 --- a/tests/generated/preview1_directory_seek.rs +++ b/tests/generated/preview1_directory_seek.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_directory_seek() -> anyhow::Result<()> { let file_name = "preview1_directory_seek"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_directory_seek --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_directory_seek"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_directory_seek --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_fd_advise.rs b/tests/generated/preview1_fd_advise.rs index 6501c6796..a3a21e84e 100644 --- a/tests/generated/preview1_fd_advise.rs +++ b/tests/generated/preview1_fd_advise.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_fd_advise() -> anyhow::Result<()> { let file_name = "preview1_fd_advise"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_advise --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_fd_advise"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_advise --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_fd_filestat_get.rs b/tests/generated/preview1_fd_filestat_get.rs index 07e4369ea..36e6d3f52 100644 --- a/tests/generated/preview1_fd_filestat_get.rs +++ b/tests/generated/preview1_fd_filestat_get.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_fd_filestat_get() -> anyhow::Result<()> { let file_name = "preview1_fd_filestat_get"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_filestat_get --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_fd_filestat_get"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_filestat_get --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_fd_filestat_set.rs b/tests/generated/preview1_fd_filestat_set.rs index 3e405b0f8..38b30705d 100644 --- a/tests/generated/preview1_fd_filestat_set.rs +++ b/tests/generated/preview1_fd_filestat_set.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_fd_filestat_set() -> anyhow::Result<()> { let file_name = "preview1_fd_filestat_set"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_filestat_set --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_fd_filestat_set"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_filestat_set --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_fd_flags_set.rs b/tests/generated/preview1_fd_flags_set.rs index 25cb55c85..ec6198467 100644 --- a/tests/generated/preview1_fd_flags_set.rs +++ b/tests/generated/preview1_fd_flags_set.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_fd_flags_set() -> anyhow::Result<()> { let file_name = "preview1_fd_flags_set"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_flags_set --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_fd_flags_set"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_flags_set --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_fd_readdir.rs b/tests/generated/preview1_fd_readdir.rs index 137586588..e330dc326 100644 --- a/tests/generated/preview1_fd_readdir.rs +++ b/tests/generated/preview1_fd_readdir.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_fd_readdir() -> anyhow::Result<()> { let file_name = "preview1_fd_readdir"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_readdir --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_fd_readdir"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_fd_readdir --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_file_allocate.rs b/tests/generated/preview1_file_allocate.rs index a9d9f0832..2e66fb21f 100644 --- a/tests/generated/preview1_file_allocate.rs +++ b/tests/generated/preview1_file_allocate.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_file_allocate() -> anyhow::Result<()> { let file_name = "preview1_file_allocate"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_allocate --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_file_allocate"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_allocate --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_file_pread_pwrite.rs b/tests/generated/preview1_file_pread_pwrite.rs index d7aa18e1f..0a223e8f0 100644 --- a/tests/generated/preview1_file_pread_pwrite.rs +++ b/tests/generated/preview1_file_pread_pwrite.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_file_pread_pwrite() -> anyhow::Result<()> { let file_name = "preview1_file_pread_pwrite"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_pread_pwrite --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_file_pread_pwrite"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_pread_pwrite --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_file_seek_tell.rs b/tests/generated/preview1_file_seek_tell.rs index d4433ea41..f63dcd42e 100644 --- a/tests/generated/preview1_file_seek_tell.rs +++ b/tests/generated/preview1_file_seek_tell.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_file_seek_tell() -> anyhow::Result<()> { let file_name = "preview1_file_seek_tell"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_seek_tell --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_file_seek_tell"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_seek_tell --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_file_truncation.rs b/tests/generated/preview1_file_truncation.rs index ad38c886e..9644ff6be 100644 --- a/tests/generated/preview1_file_truncation.rs +++ b/tests/generated/preview1_file_truncation.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_file_truncation() -> anyhow::Result<()> { let file_name = "preview1_file_truncation"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_truncation --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_file_truncation"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_truncation --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_file_unbuffered_write.rs b/tests/generated/preview1_file_unbuffered_write.rs index ff79f73d5..74550ef28 100644 --- a/tests/generated/preview1_file_unbuffered_write.rs +++ b/tests/generated/preview1_file_unbuffered_write.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_file_unbuffered_write() -> anyhow::Result<()> { let file_name = "preview1_file_unbuffered_write"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_unbuffered_write --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_file_unbuffered_write"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_unbuffered_write --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_file_write.rs b/tests/generated/preview1_file_write.rs index 943e21f6c..3bb115b53 100644 --- a/tests/generated/preview1_file_write.rs +++ b/tests/generated/preview1_file_write.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_file_write() -> anyhow::Result<()> { let file_name = "preview1_file_write"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_write --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_file_write"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_file_write --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_interesting_paths.rs b/tests/generated/preview1_interesting_paths.rs index 39b1a5d3f..51f267d7c 100644 --- a/tests/generated/preview1_interesting_paths.rs +++ b/tests/generated/preview1_interesting_paths.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_interesting_paths() -> anyhow::Result<()> { let file_name = "preview1_interesting_paths"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_interesting_paths --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_interesting_paths"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_interesting_paths --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_nofollow_errors.rs b/tests/generated/preview1_nofollow_errors.rs index 2f57365e4..2ee7530b6 100644 --- a/tests/generated/preview1_nofollow_errors.rs +++ b/tests/generated/preview1_nofollow_errors.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_nofollow_errors() -> anyhow::Result<()> { let file_name = "preview1_nofollow_errors"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_nofollow_errors --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_nofollow_errors"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_nofollow_errors --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_overwrite_preopen.rs b/tests/generated/preview1_overwrite_preopen.rs index 5376294e9..8840e9d5f 100644 --- a/tests/generated/preview1_overwrite_preopen.rs +++ b/tests/generated/preview1_overwrite_preopen.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_overwrite_preopen() -> anyhow::Result<()> { let file_name = "preview1_overwrite_preopen"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_overwrite_preopen --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_overwrite_preopen"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_overwrite_preopen --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_exists.rs b/tests/generated/preview1_path_exists.rs index 3d231020d..61ae0f9f3 100644 --- a/tests/generated/preview1_path_exists.rs +++ b/tests/generated/preview1_path_exists.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_exists() -> anyhow::Result<()> { let file_name = "preview1_path_exists"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_exists --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_exists"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_exists --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_filestat.rs b/tests/generated/preview1_path_filestat.rs index bdc5b010d..64f267101 100644 --- a/tests/generated/preview1_path_filestat.rs +++ b/tests/generated/preview1_path_filestat.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_filestat() -> anyhow::Result<()> { let file_name = "preview1_path_filestat"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_filestat --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_filestat"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_filestat --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_link.rs b/tests/generated/preview1_path_link.rs index 05e630eba..f236980ef 100644 --- a/tests/generated/preview1_path_link.rs +++ b/tests/generated/preview1_path_link.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_link() -> anyhow::Result<()> { let file_name = "preview1_path_link"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_link --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_link"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_link --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_open_create_existing.rs b/tests/generated/preview1_path_open_create_existing.rs index 8f733d4f3..030c8f1fb 100644 --- a/tests/generated/preview1_path_open_create_existing.rs +++ b/tests/generated/preview1_path_open_create_existing.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_open_create_existing() -> anyhow::Result<()> { let file_name = "preview1_path_open_create_existing"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_create_existing --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_open_create_existing"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_create_existing --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_open_dirfd_not_dir.rs b/tests/generated/preview1_path_open_dirfd_not_dir.rs index 2001ddc9e..1a493a151 100644 --- a/tests/generated/preview1_path_open_dirfd_not_dir.rs +++ b/tests/generated/preview1_path_open_dirfd_not_dir.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_open_dirfd_not_dir() -> anyhow::Result<()> { let file_name = "preview1_path_open_dirfd_not_dir"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_dirfd_not_dir --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_open_dirfd_not_dir"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_dirfd_not_dir --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_open_missing.rs b/tests/generated/preview1_path_open_missing.rs index 732a84c75..2a5e960b6 100644 --- a/tests/generated/preview1_path_open_missing.rs +++ b/tests/generated/preview1_path_open_missing.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_open_missing() -> anyhow::Result<()> { let file_name = "preview1_path_open_missing"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_missing --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_open_missing"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_missing --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_open_nonblock.rs b/tests/generated/preview1_path_open_nonblock.rs index ba9ffefb8..a4008f6ef 100644 --- a/tests/generated/preview1_path_open_nonblock.rs +++ b/tests/generated/preview1_path_open_nonblock.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_open_nonblock() -> anyhow::Result<()> { let file_name = "preview1_path_open_nonblock"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_nonblock --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_open_nonblock"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_nonblock --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_open_preopen.rs b/tests/generated/preview1_path_open_preopen.rs index d6c5d41bf..c8a173a1a 100644 --- a/tests/generated/preview1_path_open_preopen.rs +++ b/tests/generated/preview1_path_open_preopen.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_open_preopen() -> anyhow::Result<()> { let file_name = "preview1_path_open_preopen"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_preopen --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_open_preopen"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_preopen --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_open_read_write.rs b/tests/generated/preview1_path_open_read_write.rs index 66e53a879..e4daa613c 100644 --- a/tests/generated/preview1_path_open_read_write.rs +++ b/tests/generated/preview1_path_open_read_write.rs @@ -1,15 +1,17 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root -use tempdir::TempDir; -use xshell::{cmd, Shell}; +use std::fs; +// use tempdir::TempDir; +// use xshell::{cmd, Shell}; #[test] fn preview1_path_open_read_write() -> anyhow::Result<()> { - let sh = Shell::new()?; - let file_name = "preview1_path_open_read_write"; - let tempdir = TempDir::new("{file_name}")?; - let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_read_write --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; - Ok(()) + // let sh = Shell::new()?; + // let file_name = "preview1_path_open_read_write"; + // let tempdir = TempDir::new("{file_name}")?; + // let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_open_read_write"); + // cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_open_read_write --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + panic!("skipped"); // Ok(()) } diff --git a/tests/generated/preview1_path_rename.rs b/tests/generated/preview1_path_rename.rs index 6f489ce37..6f3d8f1aa 100644 --- a/tests/generated/preview1_path_rename.rs +++ b/tests/generated/preview1_path_rename.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_rename() -> anyhow::Result<()> { let file_name = "preview1_path_rename"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_rename --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_rename"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_rename --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs index 8b88dd8dc..30f442217 100644 --- a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs +++ b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_rename_dir_trailing_slashes() -> anyhow::Result<()> { let file_name = "preview1_path_rename_dir_trailing_slashes"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_rename_dir_trailing_slashes --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_rename_dir_trailing_slashes"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_rename_dir_trailing_slashes --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_rename_file_trailing_slashes.rs b/tests/generated/preview1_path_rename_file_trailing_slashes.rs index 74df12691..edac16b82 100644 --- a/tests/generated/preview1_path_rename_file_trailing_slashes.rs +++ b/tests/generated/preview1_path_rename_file_trailing_slashes.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_rename_file_trailing_slashes() -> anyhow::Result<()> { let file_name = "preview1_path_rename_file_trailing_slashes"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_rename_file_trailing_slashes --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_rename_file_trailing_slashes"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_rename_file_trailing_slashes --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_path_symlink_trailing_slashes.rs b/tests/generated/preview1_path_symlink_trailing_slashes.rs index c38a71f2b..6e8324a87 100644 --- a/tests/generated/preview1_path_symlink_trailing_slashes.rs +++ b/tests/generated/preview1_path_symlink_trailing_slashes.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_path_symlink_trailing_slashes() -> anyhow::Result<()> { let file_name = "preview1_path_symlink_trailing_slashes"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_symlink_trailing_slashes --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_path_symlink_trailing_slashes"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_path_symlink_trailing_slashes --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_poll_oneoff_files.rs b/tests/generated/preview1_poll_oneoff_files.rs index 56222d4b2..c65fa4152 100644 --- a/tests/generated/preview1_poll_oneoff_files.rs +++ b/tests/generated/preview1_poll_oneoff_files.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_poll_oneoff_files() -> anyhow::Result<()> { let file_name = "preview1_poll_oneoff_files"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_poll_oneoff_files --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_poll_oneoff_files"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_poll_oneoff_files --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_poll_oneoff_stdio.rs b/tests/generated/preview1_poll_oneoff_stdio.rs index 8fae23025..0e0dac8f6 100644 --- a/tests/generated/preview1_poll_oneoff_stdio.rs +++ b/tests/generated/preview1_poll_oneoff_stdio.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_poll_oneoff_stdio() -> anyhow::Result<()> { let file_name = "preview1_poll_oneoff_stdio"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_poll_oneoff_stdio --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_poll_oneoff_stdio"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_poll_oneoff_stdio --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_readlink.rs b/tests/generated/preview1_readlink.rs index d35b43475..b780dc908 100644 --- a/tests/generated/preview1_readlink.rs +++ b/tests/generated/preview1_readlink.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_readlink() -> anyhow::Result<()> { let file_name = "preview1_readlink"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_readlink --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_readlink"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_readlink --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_regular_file_isatty.rs b/tests/generated/preview1_regular_file_isatty.rs index 691bdbf17..d1788fbdf 100644 --- a/tests/generated/preview1_regular_file_isatty.rs +++ b/tests/generated/preview1_regular_file_isatty.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_regular_file_isatty() -> anyhow::Result<()> { let file_name = "preview1_regular_file_isatty"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_regular_file_isatty --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_regular_file_isatty"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_regular_file_isatty --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_remove_directory.rs b/tests/generated/preview1_remove_directory.rs index b74611e9a..138c472ff 100644 --- a/tests/generated/preview1_remove_directory.rs +++ b/tests/generated/preview1_remove_directory.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_remove_directory() -> anyhow::Result<()> { let file_name = "preview1_remove_directory"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_remove_directory --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_remove_directory"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_remove_directory --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_remove_directory_trailing_slashes.rs b/tests/generated/preview1_remove_directory_trailing_slashes.rs index 5909589ba..26a077270 100644 --- a/tests/generated/preview1_remove_directory_trailing_slashes.rs +++ b/tests/generated/preview1_remove_directory_trailing_slashes.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_remove_directory_trailing_slashes() -> anyhow::Result<()> { let file_name = "preview1_remove_directory_trailing_slashes"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_remove_directory_trailing_slashes --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_remove_directory_trailing_slashes"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_remove_directory_trailing_slashes --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_remove_nonempty_directory.rs b/tests/generated/preview1_remove_nonempty_directory.rs index 56e15334d..4668cdb86 100644 --- a/tests/generated/preview1_remove_nonempty_directory.rs +++ b/tests/generated/preview1_remove_nonempty_directory.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_remove_nonempty_directory() -> anyhow::Result<()> { let file_name = "preview1_remove_nonempty_directory"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_remove_nonempty_directory --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_remove_nonempty_directory"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_remove_nonempty_directory --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_renumber.rs b/tests/generated/preview1_renumber.rs index a91b04458..dea34672e 100644 --- a/tests/generated/preview1_renumber.rs +++ b/tests/generated/preview1_renumber.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_renumber() -> anyhow::Result<()> { let file_name = "preview1_renumber"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_renumber --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_renumber"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_renumber --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_sched_yield.rs b/tests/generated/preview1_sched_yield.rs index da099b7c7..e3def63d1 100644 --- a/tests/generated/preview1_sched_yield.rs +++ b/tests/generated/preview1_sched_yield.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_sched_yield() -> anyhow::Result<()> { let file_name = "preview1_sched_yield"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_sched_yield --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_sched_yield"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_sched_yield --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_stdio.rs b/tests/generated/preview1_stdio.rs index 99b4e2ff4..5f8f1f49b 100644 --- a/tests/generated/preview1_stdio.rs +++ b/tests/generated/preview1_stdio.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_stdio() -> anyhow::Result<()> { let file_name = "preview1_stdio"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_stdio --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_stdio"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_stdio --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_stdio_isatty.rs b/tests/generated/preview1_stdio_isatty.rs index 2de9d190d..41b75e2e6 100644 --- a/tests/generated/preview1_stdio_isatty.rs +++ b/tests/generated/preview1_stdio_isatty.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_stdio_isatty() -> anyhow::Result<()> { let file_name = "preview1_stdio_isatty"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_stdio_isatty --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_stdio_isatty"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_stdio_isatty --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_stdio_not_isatty.rs b/tests/generated/preview1_stdio_not_isatty.rs index d0a7151c5..498004857 100644 --- a/tests/generated/preview1_stdio_not_isatty.rs +++ b/tests/generated/preview1_stdio_not_isatty.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_stdio_not_isatty() -> anyhow::Result<()> { let file_name = "preview1_stdio_not_isatty"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_stdio_not_isatty"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_stdio_not_isatty --jco-import ./tests/virtualenvs/notty.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_symlink_create.rs b/tests/generated/preview1_symlink_create.rs index 09e48d82c..cb8609790 100644 --- a/tests/generated/preview1_symlink_create.rs +++ b/tests/generated/preview1_symlink_create.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_symlink_create() -> anyhow::Result<()> { let file_name = "preview1_symlink_create"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_symlink_create --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_symlink_create"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_symlink_create --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_symlink_filestat.rs b/tests/generated/preview1_symlink_filestat.rs index f233fd259..538532d71 100644 --- a/tests/generated/preview1_symlink_filestat.rs +++ b/tests/generated/preview1_symlink_filestat.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_symlink_filestat() -> anyhow::Result<()> { let file_name = "preview1_symlink_filestat"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_symlink_filestat --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_symlink_filestat"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_symlink_filestat --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_symlink_loop.rs b/tests/generated/preview1_symlink_loop.rs index 732d46938..6d133f125 100644 --- a/tests/generated/preview1_symlink_loop.rs +++ b/tests/generated/preview1_symlink_loop.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_symlink_loop() -> anyhow::Result<()> { let file_name = "preview1_symlink_loop"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_symlink_loop --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_symlink_loop"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_symlink_loop --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_unicode_output.rs b/tests/generated/preview1_unicode_output.rs index 5c8a2c568..39680cadc 100644 --- a/tests/generated/preview1_unicode_output.rs +++ b/tests/generated/preview1_unicode_output.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_unicode_output() -> anyhow::Result<()> { let file_name = "preview1_unicode_output"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_unicode_output --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_unicode_output"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_unicode_output --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview1_unlink_file_trailing_slashes.rs b/tests/generated/preview1_unlink_file_trailing_slashes.rs index c22eff182..14d8ccd29 100644 --- a/tests/generated/preview1_unlink_file_trailing_slashes.rs +++ b/tests/generated/preview1_unlink_file_trailing_slashes.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview1_unlink_file_trailing_slashes() -> anyhow::Result<()> { let file_name = "preview1_unlink_file_trailing_slashes"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_unlink_file_trailing_slashes --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; + let _ = fs::remove_dir_all("./tests/rundir/preview1_unlink_file_trailing_slashes"); + cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview1_unlink_file_trailing_slashes --jco-import ./tests/virtualenvs/scratch.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_ip_name_lookup.rs b/tests/generated/preview2_ip_name_lookup.rs index 76a0857bd..e7450ccdb 100644 --- a/tests/generated/preview2_ip_name_lookup.rs +++ b/tests/generated/preview2_ip_name_lookup.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_ip_name_lookup() -> anyhow::Result<()> { let file_name = "preview2_ip_name_lookup"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_ip_name_lookup"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_ip_name_lookup --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_random.rs b/tests/generated/preview2_random.rs index 1107b0bf6..ff4f75543 100644 --- a/tests/generated/preview2_random.rs +++ b/tests/generated/preview2_random.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_random() -> anyhow::Result<()> { let file_name = "preview2_random"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_random"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_random --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_sleep.rs b/tests/generated/preview2_sleep.rs index 7d7944103..c8a7e2fdd 100644 --- a/tests/generated/preview2_sleep.rs +++ b/tests/generated/preview2_sleep.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_sleep() -> anyhow::Result<()> { let file_name = "preview2_sleep"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_sleep"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_sleep --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_stream_pollable_correct.rs b/tests/generated/preview2_stream_pollable_correct.rs index 385a8db90..932170850 100644 --- a/tests/generated/preview2_stream_pollable_correct.rs +++ b/tests/generated/preview2_stream_pollable_correct.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_stream_pollable_correct() -> anyhow::Result<()> { let file_name = "preview2_stream_pollable_correct"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_stream_pollable_correct"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_stream_pollable_correct --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_stream_pollable_traps.rs b/tests/generated/preview2_stream_pollable_traps.rs index f3f429c87..d9b68927f 100644 --- a/tests/generated/preview2_stream_pollable_traps.rs +++ b/tests/generated/preview2_stream_pollable_traps.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_stream_pollable_traps() -> anyhow::Result<()> { let file_name = "preview2_stream_pollable_traps"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_stream_pollable_traps"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_stream_pollable_traps --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run().expect_err("test should exit with code 1"); Ok(()) } diff --git a/tests/generated/preview2_tcp_bind.rs b/tests/generated/preview2_tcp_bind.rs index dc3aeb74b..55ac5ee1d 100644 --- a/tests/generated/preview2_tcp_bind.rs +++ b/tests/generated/preview2_tcp_bind.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_tcp_bind() -> anyhow::Result<()> { let file_name = "preview2_tcp_bind"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_tcp_bind"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_tcp_bind --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_tcp_connect.rs b/tests/generated/preview2_tcp_connect.rs index 8d9e48154..acba5b19d 100644 --- a/tests/generated/preview2_tcp_connect.rs +++ b/tests/generated/preview2_tcp_connect.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_tcp_connect() -> anyhow::Result<()> { let file_name = "preview2_tcp_connect"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_tcp_connect"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_tcp_connect --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_tcp_sample_application.rs b/tests/generated/preview2_tcp_sample_application.rs index 6a04c5b1e..9cf3a8406 100644 --- a/tests/generated/preview2_tcp_sample_application.rs +++ b/tests/generated/preview2_tcp_sample_application.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_tcp_sample_application() -> anyhow::Result<()> { let file_name = "preview2_tcp_sample_application"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_tcp_sample_application"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_tcp_sample_application --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_tcp_sockopts.rs b/tests/generated/preview2_tcp_sockopts.rs index 41c470f42..4dbadfa5f 100644 --- a/tests/generated/preview2_tcp_sockopts.rs +++ b/tests/generated/preview2_tcp_sockopts.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_tcp_sockopts() -> anyhow::Result<()> { let file_name = "preview2_tcp_sockopts"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_tcp_sockopts"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_tcp_sockopts --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_tcp_states.rs b/tests/generated/preview2_tcp_states.rs index 0576f3a0d..e1b9786a8 100644 --- a/tests/generated/preview2_tcp_states.rs +++ b/tests/generated/preview2_tcp_states.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_tcp_states() -> anyhow::Result<()> { let file_name = "preview2_tcp_states"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_tcp_states"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_tcp_states --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_udp_bind.rs b/tests/generated/preview2_udp_bind.rs index d1538ae87..9c55bf139 100644 --- a/tests/generated/preview2_udp_bind.rs +++ b/tests/generated/preview2_udp_bind.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_udp_bind() -> anyhow::Result<()> { let file_name = "preview2_udp_bind"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_udp_bind"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_udp_bind --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_udp_connect.rs b/tests/generated/preview2_udp_connect.rs index e53d276a4..7a58a5e7d 100644 --- a/tests/generated/preview2_udp_connect.rs +++ b/tests/generated/preview2_udp_connect.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_udp_connect() -> anyhow::Result<()> { let file_name = "preview2_udp_connect"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_udp_connect"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_udp_connect --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_udp_sample_application.rs b/tests/generated/preview2_udp_sample_application.rs index 17bda2c2e..4c1b2c959 100644 --- a/tests/generated/preview2_udp_sample_application.rs +++ b/tests/generated/preview2_udp_sample_application.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_udp_sample_application() -> anyhow::Result<()> { let file_name = "preview2_udp_sample_application"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_udp_sample_application"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_udp_sample_application --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_udp_sockopts.rs b/tests/generated/preview2_udp_sockopts.rs index fbd5b7fd6..2a5aab662 100644 --- a/tests/generated/preview2_udp_sockopts.rs +++ b/tests/generated/preview2_udp_sockopts.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_udp_sockopts() -> anyhow::Result<()> { let file_name = "preview2_udp_sockopts"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_udp_sockopts"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_udp_sockopts --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/generated/preview2_udp_states.rs b/tests/generated/preview2_udp_states.rs index c680c6c14..9525988fb 100644 --- a/tests/generated/preview2_udp_states.rs +++ b/tests/generated/preview2_udp_states.rs @@ -1,6 +1,7 @@ //! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; use tempdir::TempDir; use xshell::{cmd, Shell}; @@ -10,6 +11,7 @@ fn preview2_udp_states() -> anyhow::Result<()> { let file_name = "preview2_udp_states"; let tempdir = TempDir::new("{file_name}")?; let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; + let _ = fs::remove_dir_all("./tests/rundir/preview2_udp_states"); cmd!(sh, "./src/jco.js run --jco-dir ./tests/rundir/preview2_udp_states --jco-import ./tests/virtualenvs/base.js {wasi_file} hello this '' 'is an argument' 'with 🚩 emoji'").run()?; Ok(()) } diff --git a/tests/virtualenvs/scratch.js b/tests/virtualenvs/scratch.js index 708af2092..b9fe0f621 100644 --- a/tests/virtualenvs/scratch.js +++ b/tests/virtualenvs/scratch.js @@ -1,9 +1,14 @@ -import { _setArgs } from "@bytecodealliance/preview2-shim/cli"; +import { _setArgs, _setEnv } from "@bytecodealliance/preview2-shim/cli"; import { _setPreopens } from "@bytecodealliance/preview2-shim/filesystem"; import { mkdtemp } from 'node:fs/promises'; import { rmdirSync } from 'node:fs'; import { tmpdir } from 'node:os'; +_setEnv({ + NO_ACCURATE_TIME: "1", + NO_DANGLING_FILESYSTEM: "1" +}); + _setArgs(['_', '/']); export const testDir = await mkdtemp(tmpdir()); diff --git a/xtask/src/generate/tests.rs b/xtask/src/generate/tests.rs index 05b04bcec..7b680766c 100644 --- a/xtask/src/generate/tests.rs +++ b/xtask/src/generate/tests.rs @@ -14,6 +14,7 @@ pub fn run() -> anyhow::Result<()> { // Tidy up the dir and recreate it. fs::remove_dir_all("./tests/generated")?; fs::create_dir_all("./tests/generated")?; + fs::create_dir_all("./tests/rundir")?; let mut test_names = vec![]; @@ -53,18 +54,22 @@ fn generate_test(test_name: &str) -> String { "api_time" => "fakeclocks", "preview1_stdio_not_isatty" => "notty", "cli_file_append" => "bar-jabberwock", - "preview1_close_preopen" | "preview1_dangling_fd" | "preview1_dangling_symlink" => { - "scratch" + _ => { + if test_name.starts_with("preview1") { + "scratch" + } else { + "base" + } } - _ => "base", }; + let should_error = match test_name { "cli_exit_failure" | "cli_exit_panic" | "preview2_stream_pollable_traps" => true, _ => false, }; let skip = match test_name { - // this test currently stalls - "api_read_only" => true, + // these tests currently stall + "api_read_only" | "preview1_path_open_read_write" => true, _ => false, }; let skip_comment = if skip { "// " } else { "" }; @@ -72,6 +77,7 @@ fn generate_test(test_name: &str) -> String { r##"//! This file has been auto-generated, please do not modify manually //! To regenerate this file re-run `cargo xtask generate tests` from the project root +use std::fs; {skip_comment}use tempdir::TempDir; {skip_comment}use xshell::{{cmd, Shell}}; @@ -81,17 +87,18 @@ fn {test_name}() -> anyhow::Result<()> {{ {skip_comment}let file_name = "{test_name}"; {skip_comment}let tempdir = TempDir::new("{{file_name}}")?; {skip_comment}let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?; - {}cmd!(sh, "./src/jco.js run {} --jco-dir ./tests/rundir/{test_name} --jco-import ./tests/virtualenvs/{virtual_env}.js {{wasi_file}} hello this '' 'is an argument' 'with 🚩 emoji'").run(){}; - {skip_comment}Ok(()) + let _ = fs::remove_dir_all("./tests/rundir/{test_name}"); + {skip_comment}cmd!(sh, "./src/jco.js run {} --jco-dir ./tests/rundir/{test_name} --jco-import ./tests/virtualenvs/{virtual_env}.js {{wasi_file}} hello this '' 'is an argument' 'with 🚩 emoji'").run(){}; + {}Ok(()) }} "##, - if skip { "panic!(\"skipped\"); // " } else { "" }, if TRACE { "--jco-trace" } else { "" }, if !should_error { "?" } else { ".expect_err(\"test should exit with code 1\")" - } + }, + if skip { "panic!(\"skipped\"); // " } else { "" } ) }