From c9a6b4ce0176b5a1d6072e87dfa7e87126e7f278 Mon Sep 17 00:00:00 2001
From: Guy Bedford <gbedford@fastly.com>
Date: Mon, 20 Nov 2023 17:47:30 -0800
Subject: [PATCH 1/8] fix test formatting

---
 tests/generated/api_read_only.rs | 4 ++--
 xtask/src/generate/tests.rs      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/generated/api_read_only.rs b/tests/generated/api_read_only.rs
index 11ccf1462..f8773a3ed 100644
--- a/tests/generated/api_read_only.rs
+++ b/tests/generated/api_read_only.rs
@@ -10,6 +10,6 @@ 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(())
+    // 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/xtask/src/generate/tests.rs b/xtask/src/generate/tests.rs
index 05b04bcec..5a606b3e1 100644
--- a/xtask/src/generate/tests.rs
+++ b/xtask/src/generate/tests.rs
@@ -81,17 +81,17 @@ 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(())
+    {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 { "" }
     )
 }
 

From 94840f40be79bac9528672a88ed372ac86c3e0ef Mon Sep 17 00:00:00 2001
From: Guy Bedford <gbedford@fastly.com>
Date: Tue, 21 Nov 2023 10:20:55 -0800
Subject: [PATCH 2/8] conformance

---
 .../preview2-shim/lib/nodejs/filesystem.js    | 53 ++++++++++++++++---
 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              |  2 +
 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          |  4 +-
 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 +
 xtask/src/generate/tests.rs                   | 12 +++--
 102 files changed, 301 insertions(+), 58 deletions(-)

diff --git a/packages/preview2-shim/lib/nodejs/filesystem.js b/packages/preview2-shim/lib/nodejs/filesystem.js
index 340e2acbf..e5f48784b 100644
--- a/packages/preview2-shim/lib/nodejs/filesystem.js
+++ b/packages/preview2-shim/lib/nodejs/filesystem.js
@@ -12,6 +12,8 @@ import {
   fdatasyncSync,
   fstatSync,
   fsyncSync,
+  ftruncateSync,
+  futimesSync,
   lstatSync,
   mkdirSync,
   opendirSync,
@@ -139,17 +141,45 @@ 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) {
@@ -239,7 +269,7 @@ class Descriptor {
   }
 
   setTimesAt() {
-    console.log(`[filesystem] SET TIMES AT`, this._id);
+    const fullPath = this.#getFullPath(path, false);
   }
 
   linkAt() {
@@ -365,7 +395,7 @@ class Descriptor {
         (descriptor.#hostPreopen.endsWith("/") ? "" : "/") +
         subpath
       );
-    return descriptor.#fullPath + (subpath.length > 0 ? "/" : '') + subpath;
+    return descriptor.#fullPath + (subpath.length > 0 ? "/" : "") + subpath;
   }
 
   [symbolDispose]() {
@@ -516,3 +546,12 @@ function convertFsError(e) {
       throw e;
   }
 }
+
+function timestampToMs(timestamp) {
+  let zeros = '';
+  while (timestamp.nanoseconds < 10 ** (8 - zeros.length)) {
+    zeros += '0';
+  }
+  const out = `${Number(timestamp.seconds) * 1000}.${zeros}${timestamp.nanoseconds}`;
+  return out;
+}
diff --git a/submodules/wasmtime b/submodules/wasmtime
index 3068d372b..36fda7d26 160000
--- a/submodules/wasmtime
+++ b/submodules/wasmtime
@@ -1 +1 @@
-Subproject commit 3068d372ba446be77e9602d5294bf9a19bb9cd90
+Subproject commit 36fda7d265f63566050c833c2ffdbddef29665d0
diff --git a/tests/generated/api_proxy.rs b/tests/generated/api_proxy.rs
index 43dd75a59..327851f5f 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)?;
+    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..7b4ea25b5 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)?;
+    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..f016ac907 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)?;
+    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 f8773a3ed..b1d2cbf9d 100644
--- a/tests/generated/api_read_only.rs
+++ b/tests/generated/api_read_only.rs
@@ -3,6 +3,7 @@
 
 // use tempdir::TempDir;
 // use xshell::{cmd, Shell};
+use std::fs;
 
 #[test]
 fn api_read_only() -> anyhow::Result<()> {
@@ -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)?;
+    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..8ed5d5f2b 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)?;
+    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..ac9c9f3a5 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)?;
+    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..7885f0958 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)?;
+    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..f43496e94 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)?;
+    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..00c737853 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)?;
+    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..e77d404b4 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)?;
+    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..f420d4075 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)?;
+    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..9c0912968 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)?;
+    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..3e94425ce 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)?;
+    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..93479cb83 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)?;
+    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..38c70462d 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)?;
+    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..da2a12af9 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)?;
+    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..9c6adc5ef 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)?;
+    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..31f9ad6a0 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)?;
+    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..40d90df4c 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)?;
+    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..a526dfe35 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)?;
+    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..9e7158c6f 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)?;
+    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..2a2c047a7 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)?;
+    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..2720b9c5f 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)?;
+    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..62f841e47 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)?;
+    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..bd30d63b2 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)?;
+    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..a5da6c801 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)?;
+    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..448f46706 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)?;
+    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..e51f0e758 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)?;
+    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..6f77f632f 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)?;
+    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..1352aa215 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)?;
+    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..17dad6da4 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)?;
+    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..932d073d3 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)?;
+    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..a8a8222fe 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)?;
+    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..707709707 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()?;
+    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..d17bd565d 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()?;
+    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..3733ff1c9 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)?;
+    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..b92fb8ec9 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)?;
+    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..6072f95dd 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)?;
+    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..1bc59b0e0 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()?;
+    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..e51554623 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()?;
+    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..48e6cdefd 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()?;
+    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..220bed01d 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()?;
+    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..2302a5553 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()?;
+    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..72c78b00e 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()?;
+    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..c86ae3d49 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()?;
+    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..aa4b8412b 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()?;
+    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..1e92edc3a 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()?;
+    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..ca21ed3d6 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()?;
+    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..424c15035 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()?;
+    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..88f3a9f7e 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()?;
+    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..deb624fa4 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()?;
+    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..d44394a77 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()?;
+    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..16f7eabb2 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()?;
+    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..886260e82 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()?;
+    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..b705d986a 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()?;
+    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..ce0187695 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()?;
+    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..fd30e1f5e 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()?;
+    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..d3f0db748 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()?;
+    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..d495bf8e8 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()?;
+    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..9d3d1d23b 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()?;
+    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..a756351a6 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()?;
+    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..2ee5142c8 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()?;
+    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..2f417ee8d 100644
--- a/tests/generated/preview1_path_open_read_write.rs
+++ b/tests/generated/preview1_path_open_read_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_path_open_read_write() -> anyhow::Result<()> {
     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()?;
+    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()?;
     Ok(())
 }
diff --git a/tests/generated/preview1_path_rename.rs b/tests/generated/preview1_path_rename.rs
index 6f489ce37..106797835 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()?;
+    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..a66706711 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()?;
+    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..a0e775718 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()?;
+    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..42235dfb3 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()?;
+    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..e93a50f76 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()?;
+    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..5ce8dbd23 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()?;
+    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..d417177b6 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()?;
+    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..79079dbd0 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()?;
+    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..0fc27f37c 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()?;
+    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..571b92bb7 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()?;
+    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..91563b760 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()?;
+    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..9c97efdd9 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()?;
+    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..6b9aa1fe4 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()?;
+    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..0d14c4197 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()?;
+    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..4db89c7e8 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()?;
+    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..842495aad 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)?;
+    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..285886592 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()?;
+    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..219e65e5a 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()?;
+    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..97bebb78c 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()?;
+    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..5e53a07cd 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()?;
+    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..72f4310cb 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()?;
+    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..4768657ca 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)?;
+    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..eb7d68dbe 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)?;
+    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..fcb9dcec9 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)?;
+    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..87bed0d75 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)?;
+    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..2e239d665 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)?;
+    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..2327ad055 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)?;
+    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..1daf295a4 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)?;
+    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..7340fb521 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)?;
+    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..effcb29bd 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)?;
+    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..0a959b680 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)?;
+    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..b4bc6df70 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)?;
+    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..f0e181c6e 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)?;
+    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..d7678c6bf 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)?;
+    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..7840396f8 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)?;
+    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..6f71845b8 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)?;
+    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/xtask/src/generate/tests.rs b/xtask/src/generate/tests.rs
index 5a606b3e1..5c4599bf2 100644
--- a/xtask/src/generate/tests.rs
+++ b/xtask/src/generate/tests.rs
@@ -53,11 +53,15 @@ 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,
@@ -74,6 +78,7 @@ fn generate_test(test_name: &str) -> String {
 
 {skip_comment}use tempdir::TempDir;
 {skip_comment}use xshell::{{cmd, Shell}};
+use std::fs;
 
 #[test]
 fn {test_name}() -> anyhow::Result<()> {{
@@ -81,6 +86,7 @@ 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)?;
+    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(())
 }}

From bc0ac3bdb74b3f7565abce07f1421258c139ee62 Mon Sep 17 00:00:00 2001
From: Guy Bedford <gbedford@fastly.com>
Date: Tue, 21 Nov 2023 11:35:38 -0800
Subject: [PATCH 3/8] flags

---
 packages/preview2-shim/lib/nodejs/filesystem.js             | 6 +++---
 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                            | 2 +-
 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 +-
 tests/generated/http_outbound_request_content_length.rs     | 2 +-
 tests/generated/http_outbound_request_get.rs                | 2 +-
 tests/generated/http_outbound_request_invalid_dnsname.rs    | 2 +-
 tests/generated/http_outbound_request_invalid_header.rs     | 2 +-
 tests/generated/http_outbound_request_invalid_port.rs       | 2 +-
 tests/generated/http_outbound_request_invalid_version.rs    | 2 +-
 tests/generated/http_outbound_request_large_post.rs         | 2 +-
 tests/generated/http_outbound_request_post.rs               | 2 +-
 tests/generated/http_outbound_request_put.rs                | 2 +-
 tests/generated/http_outbound_request_response_build.rs     | 2 +-
 tests/generated/http_outbound_request_unknown_method.rs     | 2 +-
 tests/generated/http_outbound_request_unsupported_scheme.rs | 2 +-
 tests/generated/preview1_big_random_buf.rs                  | 2 +-
 tests/generated/preview1_clock_time_get.rs                  | 2 +-
 tests/generated/preview1_close_preopen.rs                   | 2 +-
 tests/generated/preview1_dangling_fd.rs                     | 2 +-
 tests/generated/preview1_dangling_symlink.rs                | 2 +-
 tests/generated/preview1_dir_fd_op_failures.rs              | 2 +-
 tests/generated/preview1_directory_seek.rs                  | 2 +-
 tests/generated/preview1_fd_advise.rs                       | 2 +-
 tests/generated/preview1_fd_filestat_get.rs                 | 2 +-
 tests/generated/preview1_fd_filestat_set.rs                 | 2 +-
 tests/generated/preview1_fd_flags_set.rs                    | 2 +-
 tests/generated/preview1_fd_readdir.rs                      | 2 +-
 tests/generated/preview1_file_allocate.rs                   | 2 +-
 tests/generated/preview1_file_pread_pwrite.rs               | 2 +-
 tests/generated/preview1_file_seek_tell.rs                  | 2 +-
 tests/generated/preview1_file_truncation.rs                 | 2 +-
 tests/generated/preview1_file_unbuffered_write.rs           | 2 +-
 tests/generated/preview1_file_write.rs                      | 2 +-
 tests/generated/preview1_interesting_paths.rs               | 2 +-
 tests/generated/preview1_nofollow_errors.rs                 | 2 +-
 tests/generated/preview1_overwrite_preopen.rs               | 2 +-
 tests/generated/preview1_path_exists.rs                     | 2 +-
 tests/generated/preview1_path_filestat.rs                   | 2 +-
 tests/generated/preview1_path_link.rs                       | 2 +-
 tests/generated/preview1_path_open_create_existing.rs       | 2 +-
 tests/generated/preview1_path_open_dirfd_not_dir.rs         | 2 +-
 tests/generated/preview1_path_open_missing.rs               | 2 +-
 tests/generated/preview1_path_open_nonblock.rs              | 2 +-
 tests/generated/preview1_path_open_preopen.rs               | 2 +-
 tests/generated/preview1_path_open_read_write.rs            | 2 +-
 tests/generated/preview1_path_rename.rs                     | 2 +-
 .../generated/preview1_path_rename_dir_trailing_slashes.rs  | 2 +-
 .../generated/preview1_path_rename_file_trailing_slashes.rs | 2 +-
 tests/generated/preview1_path_symlink_trailing_slashes.rs   | 2 +-
 tests/generated/preview1_poll_oneoff_files.rs               | 2 +-
 tests/generated/preview1_poll_oneoff_stdio.rs               | 2 +-
 tests/generated/preview1_readlink.rs                        | 2 +-
 tests/generated/preview1_regular_file_isatty.rs             | 2 +-
 tests/generated/preview1_remove_directory.rs                | 2 +-
 .../generated/preview1_remove_directory_trailing_slashes.rs | 2 +-
 tests/generated/preview1_remove_nonempty_directory.rs       | 2 +-
 tests/generated/preview1_renumber.rs                        | 2 +-
 tests/generated/preview1_sched_yield.rs                     | 2 +-
 tests/generated/preview1_stdio.rs                           | 2 +-
 tests/generated/preview1_stdio_isatty.rs                    | 2 +-
 tests/generated/preview1_stdio_not_isatty.rs                | 2 +-
 tests/generated/preview1_symlink_create.rs                  | 2 +-
 tests/generated/preview1_symlink_filestat.rs                | 2 +-
 tests/generated/preview1_symlink_loop.rs                    | 2 +-
 tests/generated/preview1_unicode_output.rs                  | 2 +-
 tests/generated/preview1_unlink_file_trailing_slashes.rs    | 2 +-
 tests/generated/preview2_ip_name_lookup.rs                  | 2 +-
 tests/generated/preview2_random.rs                          | 2 +-
 tests/generated/preview2_sleep.rs                           | 2 +-
 tests/generated/preview2_stream_pollable_correct.rs         | 2 +-
 tests/generated/preview2_stream_pollable_traps.rs           | 2 +-
 tests/generated/preview2_tcp_bind.rs                        | 2 +-
 tests/generated/preview2_tcp_connect.rs                     | 2 +-
 tests/generated/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 +-
 tests/generated/preview2_udp_sample_application.rs          | 2 +-
 tests/generated/preview2_udp_sockopts.rs                    | 2 +-
 tests/generated/preview2_udp_states.rs                      | 2 +-
 xtask/src/generate/tests.rs                                 | 3 ++-
 101 files changed, 104 insertions(+), 103 deletions(-)

diff --git a/packages/preview2-shim/lib/nodejs/filesystem.js b/packages/preview2-shim/lib/nodejs/filesystem.js
index e5f48784b..e9e26946b 100644
--- a/packages/preview2-shim/lib/nodejs/filesystem.js
+++ b/packages/preview2-shim/lib/nodejs/filesystem.js
@@ -123,8 +123,8 @@ class Descriptor {
     }
     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,
+      read: ((mode & constants.S_IRUSR) | (mode & constants.S_IRGRP) | (mode & constants.S_IROTH)) > 0,
+      write: ((mode & constants.S_IWUSR) | (mode & constants.S_IWGRP) | (mode & constants.S_IWOTH)) > 0,
       // TODO:
       fileIntegritySync: false,
       dataIntegritySync: false,
@@ -269,7 +269,7 @@ class Descriptor {
   }
 
   setTimesAt() {
-    const fullPath = this.#getFullPath(path, false);
+    // const fullPath = this.#getFullPath(path, false);
   }
 
   linkAt() {
diff --git a/tests/generated/api_proxy.rs b/tests/generated/api_proxy.rs
index 327851f5f..8fa8f30c6 100644
--- a/tests/generated/api_proxy.rs
+++ b/tests/generated/api_proxy.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/api_proxy")?;
+    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 7b4ea25b5..bac9b2cd6 100644
--- a/tests/generated/api_proxy_streaming.rs
+++ b/tests/generated/api_proxy_streaming.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/api_proxy_streaming")?;
+    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 f016ac907..9ee427b5a 100644
--- a/tests/generated/api_reactor.rs
+++ b/tests/generated/api_reactor.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/api_reactor")?;
+    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 b1d2cbf9d..76509fdb3 100644
--- a/tests/generated/api_read_only.rs
+++ b/tests/generated/api_read_only.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/api_read_only")?;
+    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 8ed5d5f2b..7804809eb 100644
--- a/tests/generated/api_time.rs
+++ b/tests/generated/api_time.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/api_time")?;
+    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 ac9c9f3a5..7bf349567 100644
--- a/tests/generated/cli_args.rs
+++ b/tests/generated/cli_args.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_args")?;
+    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 7885f0958..ccffefbe7 100644
--- a/tests/generated/cli_default_clocks.rs
+++ b/tests/generated/cli_default_clocks.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_default_clocks")?;
+    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 f43496e94..47d2bdca6 100644
--- a/tests/generated/cli_directory_list.rs
+++ b/tests/generated/cli_directory_list.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_directory_list")?;
+    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 00c737853..83b33d0fd 100644
--- a/tests/generated/cli_env.rs
+++ b/tests/generated/cli_env.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_env")?;
+    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 e77d404b4..1a2620d7a 100644
--- a/tests/generated/cli_exit_default.rs
+++ b/tests/generated/cli_exit_default.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_exit_default")?;
+    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 f420d4075..09d950ca1 100644
--- a/tests/generated/cli_exit_failure.rs
+++ b/tests/generated/cli_exit_failure.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_exit_failure")?;
+    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 9c0912968..61acab4c2 100644
--- a/tests/generated/cli_exit_panic.rs
+++ b/tests/generated/cli_exit_panic.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_exit_panic")?;
+    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 3e94425ce..42a74ae65 100644
--- a/tests/generated/cli_exit_success.rs
+++ b/tests/generated/cli_exit_success.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_exit_success")?;
+    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 93479cb83..5006a7384 100644
--- a/tests/generated/cli_export_cabi_realloc.rs
+++ b/tests/generated/cli_export_cabi_realloc.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_export_cabi_realloc")?;
+    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 38c70462d..a59b5d0be 100644
--- a/tests/generated/cli_file_append.rs
+++ b/tests/generated/cli_file_append.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_file_append")?;
+    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 da2a12af9..0716394a2 100644
--- a/tests/generated/cli_file_dir_sync.rs
+++ b/tests/generated/cli_file_dir_sync.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_file_dir_sync")?;
+    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 9c6adc5ef..f2912e946 100644
--- a/tests/generated/cli_file_read.rs
+++ b/tests/generated/cli_file_read.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_file_read")?;
+    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 31f9ad6a0..3d3dc7634 100644
--- a/tests/generated/cli_hello_stdout.rs
+++ b/tests/generated/cli_hello_stdout.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_hello_stdout")?;
+    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 40d90df4c..3f19a6f42 100644
--- a/tests/generated/cli_splice_stdin.rs
+++ b/tests/generated/cli_splice_stdin.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_splice_stdin")?;
+    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 a526dfe35..e41c9d9c2 100644
--- a/tests/generated/cli_stdin.rs
+++ b/tests/generated/cli_stdin.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_stdin")?;
+    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 9e7158c6f..dd10b6ebb 100644
--- a/tests/generated/cli_stdio_write_flushes.rs
+++ b/tests/generated/cli_stdio_write_flushes.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/cli_stdio_write_flushes")?;
+    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 2a2c047a7..38c8e9ad0 100644
--- a/tests/generated/http_outbound_request_content_length.rs
+++ b/tests/generated/http_outbound_request_content_length.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_content_length")?;
+    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 2720b9c5f..73d7438c5 100644
--- a/tests/generated/http_outbound_request_get.rs
+++ b/tests/generated/http_outbound_request_get.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_get")?;
+    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 62f841e47..afb667fee 100644
--- a/tests/generated/http_outbound_request_invalid_dnsname.rs
+++ b/tests/generated/http_outbound_request_invalid_dnsname.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_invalid_dnsname")?;
+    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 bd30d63b2..5f492534b 100644
--- a/tests/generated/http_outbound_request_invalid_header.rs
+++ b/tests/generated/http_outbound_request_invalid_header.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_invalid_header")?;
+    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 a5da6c801..81c687d52 100644
--- a/tests/generated/http_outbound_request_invalid_port.rs
+++ b/tests/generated/http_outbound_request_invalid_port.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_invalid_port")?;
+    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 448f46706..ce2c9cdc9 100644
--- a/tests/generated/http_outbound_request_invalid_version.rs
+++ b/tests/generated/http_outbound_request_invalid_version.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_invalid_version")?;
+    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 e51f0e758..e709ab87f 100644
--- a/tests/generated/http_outbound_request_large_post.rs
+++ b/tests/generated/http_outbound_request_large_post.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_large_post")?;
+    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 6f77f632f..fce263ea6 100644
--- a/tests/generated/http_outbound_request_post.rs
+++ b/tests/generated/http_outbound_request_post.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_post")?;
+    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 1352aa215..5410fbd47 100644
--- a/tests/generated/http_outbound_request_put.rs
+++ b/tests/generated/http_outbound_request_put.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_put")?;
+    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 17dad6da4..6c945b4bb 100644
--- a/tests/generated/http_outbound_request_response_build.rs
+++ b/tests/generated/http_outbound_request_response_build.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_response_build")?;
+    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 932d073d3..12be199c2 100644
--- a/tests/generated/http_outbound_request_unknown_method.rs
+++ b/tests/generated/http_outbound_request_unknown_method.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_unknown_method")?;
+    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 a8a8222fe..9e136f6a2 100644
--- a/tests/generated/http_outbound_request_unsupported_scheme.rs
+++ b/tests/generated/http_outbound_request_unsupported_scheme.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/http_outbound_request_unsupported_scheme")?;
+    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 707709707..ceeeb94c4 100644
--- a/tests/generated/preview1_big_random_buf.rs
+++ b/tests/generated/preview1_big_random_buf.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_big_random_buf")?;
+    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 d17bd565d..8e6050a1e 100644
--- a/tests/generated/preview1_clock_time_get.rs
+++ b/tests/generated/preview1_clock_time_get.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_clock_time_get")?;
+    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 3733ff1c9..77a18188c 100644
--- a/tests/generated/preview1_close_preopen.rs
+++ b/tests/generated/preview1_close_preopen.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_close_preopen")?;
+    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 b92fb8ec9..0d897cb94 100644
--- a/tests/generated/preview1_dangling_fd.rs
+++ b/tests/generated/preview1_dangling_fd.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_dangling_fd")?;
+    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 6072f95dd..293d70900 100644
--- a/tests/generated/preview1_dangling_symlink.rs
+++ b/tests/generated/preview1_dangling_symlink.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_dangling_symlink")?;
+    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 1bc59b0e0..d4d992854 100644
--- a/tests/generated/preview1_dir_fd_op_failures.rs
+++ b/tests/generated/preview1_dir_fd_op_failures.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_dir_fd_op_failures")?;
+    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 e51554623..f7f92b325 100644
--- a/tests/generated/preview1_directory_seek.rs
+++ b/tests/generated/preview1_directory_seek.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_directory_seek")?;
+    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 48e6cdefd..a3a21e84e 100644
--- a/tests/generated/preview1_fd_advise.rs
+++ b/tests/generated/preview1_fd_advise.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_fd_advise")?;
+    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 220bed01d..36e6d3f52 100644
--- a/tests/generated/preview1_fd_filestat_get.rs
+++ b/tests/generated/preview1_fd_filestat_get.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_fd_filestat_get")?;
+    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 2302a5553..38b30705d 100644
--- a/tests/generated/preview1_fd_filestat_set.rs
+++ b/tests/generated/preview1_fd_filestat_set.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_fd_filestat_set")?;
+    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 72c78b00e..ec6198467 100644
--- a/tests/generated/preview1_fd_flags_set.rs
+++ b/tests/generated/preview1_fd_flags_set.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_fd_flags_set")?;
+    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 c86ae3d49..e330dc326 100644
--- a/tests/generated/preview1_fd_readdir.rs
+++ b/tests/generated/preview1_fd_readdir.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_fd_readdir")?;
+    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 aa4b8412b..2e66fb21f 100644
--- a/tests/generated/preview1_file_allocate.rs
+++ b/tests/generated/preview1_file_allocate.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_file_allocate")?;
+    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 1e92edc3a..0a223e8f0 100644
--- a/tests/generated/preview1_file_pread_pwrite.rs
+++ b/tests/generated/preview1_file_pread_pwrite.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_file_pread_pwrite")?;
+    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 ca21ed3d6..f63dcd42e 100644
--- a/tests/generated/preview1_file_seek_tell.rs
+++ b/tests/generated/preview1_file_seek_tell.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_file_seek_tell")?;
+    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 424c15035..9644ff6be 100644
--- a/tests/generated/preview1_file_truncation.rs
+++ b/tests/generated/preview1_file_truncation.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_file_truncation")?;
+    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 88f3a9f7e..74550ef28 100644
--- a/tests/generated/preview1_file_unbuffered_write.rs
+++ b/tests/generated/preview1_file_unbuffered_write.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_file_unbuffered_write")?;
+    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 deb624fa4..3bb115b53 100644
--- a/tests/generated/preview1_file_write.rs
+++ b/tests/generated/preview1_file_write.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_file_write")?;
+    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 d44394a77..51f267d7c 100644
--- a/tests/generated/preview1_interesting_paths.rs
+++ b/tests/generated/preview1_interesting_paths.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_interesting_paths")?;
+    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 16f7eabb2..2ee7530b6 100644
--- a/tests/generated/preview1_nofollow_errors.rs
+++ b/tests/generated/preview1_nofollow_errors.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_nofollow_errors")?;
+    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 886260e82..8840e9d5f 100644
--- a/tests/generated/preview1_overwrite_preopen.rs
+++ b/tests/generated/preview1_overwrite_preopen.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_overwrite_preopen")?;
+    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 b705d986a..61ae0f9f3 100644
--- a/tests/generated/preview1_path_exists.rs
+++ b/tests/generated/preview1_path_exists.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_exists")?;
+    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 ce0187695..64f267101 100644
--- a/tests/generated/preview1_path_filestat.rs
+++ b/tests/generated/preview1_path_filestat.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_filestat")?;
+    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 fd30e1f5e..f236980ef 100644
--- a/tests/generated/preview1_path_link.rs
+++ b/tests/generated/preview1_path_link.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_link")?;
+    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 d3f0db748..030c8f1fb 100644
--- a/tests/generated/preview1_path_open_create_existing.rs
+++ b/tests/generated/preview1_path_open_create_existing.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_open_create_existing")?;
+    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 d495bf8e8..1a493a151 100644
--- a/tests/generated/preview1_path_open_dirfd_not_dir.rs
+++ b/tests/generated/preview1_path_open_dirfd_not_dir.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_open_dirfd_not_dir")?;
+    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 9d3d1d23b..2a5e960b6 100644
--- a/tests/generated/preview1_path_open_missing.rs
+++ b/tests/generated/preview1_path_open_missing.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_open_missing")?;
+    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 a756351a6..a4008f6ef 100644
--- a/tests/generated/preview1_path_open_nonblock.rs
+++ b/tests/generated/preview1_path_open_nonblock.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_open_nonblock")?;
+    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 2ee5142c8..c8a173a1a 100644
--- a/tests/generated/preview1_path_open_preopen.rs
+++ b/tests/generated/preview1_path_open_preopen.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_open_preopen")?;
+    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 2f417ee8d..ef4a150cf 100644
--- a/tests/generated/preview1_path_open_read_write.rs
+++ b/tests/generated/preview1_path_open_read_write.rs
@@ -11,7 +11,7 @@ fn preview1_path_open_read_write() -> anyhow::Result<()> {
     let file_name = "preview1_path_open_read_write";
     let tempdir = TempDir::new("{file_name}")?;
     let wasi_file = test_utils::compile(&sh, &tempdir, &file_name)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_open_read_write")?;
+    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()?;
     Ok(())
 }
diff --git a/tests/generated/preview1_path_rename.rs b/tests/generated/preview1_path_rename.rs
index 106797835..6f3d8f1aa 100644
--- a/tests/generated/preview1_path_rename.rs
+++ b/tests/generated/preview1_path_rename.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_rename")?;
+    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 a66706711..30f442217 100644
--- a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_rename_dir_trailing_slashes")?;
+    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 a0e775718..edac16b82 100644
--- a/tests/generated/preview1_path_rename_file_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_file_trailing_slashes.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_rename_file_trailing_slashes")?;
+    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 42235dfb3..6e8324a87 100644
--- a/tests/generated/preview1_path_symlink_trailing_slashes.rs
+++ b/tests/generated/preview1_path_symlink_trailing_slashes.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_path_symlink_trailing_slashes")?;
+    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 e93a50f76..c65fa4152 100644
--- a/tests/generated/preview1_poll_oneoff_files.rs
+++ b/tests/generated/preview1_poll_oneoff_files.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_poll_oneoff_files")?;
+    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 5ce8dbd23..0e0dac8f6 100644
--- a/tests/generated/preview1_poll_oneoff_stdio.rs
+++ b/tests/generated/preview1_poll_oneoff_stdio.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_poll_oneoff_stdio")?;
+    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 d417177b6..b780dc908 100644
--- a/tests/generated/preview1_readlink.rs
+++ b/tests/generated/preview1_readlink.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_readlink")?;
+    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 79079dbd0..d1788fbdf 100644
--- a/tests/generated/preview1_regular_file_isatty.rs
+++ b/tests/generated/preview1_regular_file_isatty.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_regular_file_isatty")?;
+    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 0fc27f37c..138c472ff 100644
--- a/tests/generated/preview1_remove_directory.rs
+++ b/tests/generated/preview1_remove_directory.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_remove_directory")?;
+    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 571b92bb7..26a077270 100644
--- a/tests/generated/preview1_remove_directory_trailing_slashes.rs
+++ b/tests/generated/preview1_remove_directory_trailing_slashes.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_remove_directory_trailing_slashes")?;
+    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 91563b760..4668cdb86 100644
--- a/tests/generated/preview1_remove_nonempty_directory.rs
+++ b/tests/generated/preview1_remove_nonempty_directory.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_remove_nonempty_directory")?;
+    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 9c97efdd9..dea34672e 100644
--- a/tests/generated/preview1_renumber.rs
+++ b/tests/generated/preview1_renumber.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_renumber")?;
+    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 6b9aa1fe4..e3def63d1 100644
--- a/tests/generated/preview1_sched_yield.rs
+++ b/tests/generated/preview1_sched_yield.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_sched_yield")?;
+    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 0d14c4197..5f8f1f49b 100644
--- a/tests/generated/preview1_stdio.rs
+++ b/tests/generated/preview1_stdio.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_stdio")?;
+    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 4db89c7e8..41b75e2e6 100644
--- a/tests/generated/preview1_stdio_isatty.rs
+++ b/tests/generated/preview1_stdio_isatty.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_stdio_isatty")?;
+    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 842495aad..498004857 100644
--- a/tests/generated/preview1_stdio_not_isatty.rs
+++ b/tests/generated/preview1_stdio_not_isatty.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_stdio_not_isatty")?;
+    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 285886592..cb8609790 100644
--- a/tests/generated/preview1_symlink_create.rs
+++ b/tests/generated/preview1_symlink_create.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_symlink_create")?;
+    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 219e65e5a..538532d71 100644
--- a/tests/generated/preview1_symlink_filestat.rs
+++ b/tests/generated/preview1_symlink_filestat.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_symlink_filestat")?;
+    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 97bebb78c..6d133f125 100644
--- a/tests/generated/preview1_symlink_loop.rs
+++ b/tests/generated/preview1_symlink_loop.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_symlink_loop")?;
+    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 5e53a07cd..39680cadc 100644
--- a/tests/generated/preview1_unicode_output.rs
+++ b/tests/generated/preview1_unicode_output.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_unicode_output")?;
+    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 72f4310cb..14d8ccd29 100644
--- a/tests/generated/preview1_unlink_file_trailing_slashes.rs
+++ b/tests/generated/preview1_unlink_file_trailing_slashes.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview1_unlink_file_trailing_slashes")?;
+    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 4768657ca..e7450ccdb 100644
--- a/tests/generated/preview2_ip_name_lookup.rs
+++ b/tests/generated/preview2_ip_name_lookup.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_ip_name_lookup")?;
+    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 eb7d68dbe..ff4f75543 100644
--- a/tests/generated/preview2_random.rs
+++ b/tests/generated/preview2_random.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_random")?;
+    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 fcb9dcec9..c8a7e2fdd 100644
--- a/tests/generated/preview2_sleep.rs
+++ b/tests/generated/preview2_sleep.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_sleep")?;
+    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 87bed0d75..932170850 100644
--- a/tests/generated/preview2_stream_pollable_correct.rs
+++ b/tests/generated/preview2_stream_pollable_correct.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_stream_pollable_correct")?;
+    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 2e239d665..d9b68927f 100644
--- a/tests/generated/preview2_stream_pollable_traps.rs
+++ b/tests/generated/preview2_stream_pollable_traps.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_stream_pollable_traps")?;
+    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 2327ad055..55ac5ee1d 100644
--- a/tests/generated/preview2_tcp_bind.rs
+++ b/tests/generated/preview2_tcp_bind.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_tcp_bind")?;
+    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 1daf295a4..acba5b19d 100644
--- a/tests/generated/preview2_tcp_connect.rs
+++ b/tests/generated/preview2_tcp_connect.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_tcp_connect")?;
+    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 7340fb521..9cf3a8406 100644
--- a/tests/generated/preview2_tcp_sample_application.rs
+++ b/tests/generated/preview2_tcp_sample_application.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_tcp_sample_application")?;
+    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 effcb29bd..4dbadfa5f 100644
--- a/tests/generated/preview2_tcp_sockopts.rs
+++ b/tests/generated/preview2_tcp_sockopts.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_tcp_sockopts")?;
+    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 0a959b680..e1b9786a8 100644
--- a/tests/generated/preview2_tcp_states.rs
+++ b/tests/generated/preview2_tcp_states.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_tcp_states")?;
+    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 b4bc6df70..9c55bf139 100644
--- a/tests/generated/preview2_udp_bind.rs
+++ b/tests/generated/preview2_udp_bind.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_udp_bind")?;
+    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 f0e181c6e..7a58a5e7d 100644
--- a/tests/generated/preview2_udp_connect.rs
+++ b/tests/generated/preview2_udp_connect.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_udp_connect")?;
+    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 d7678c6bf..4c1b2c959 100644
--- a/tests/generated/preview2_udp_sample_application.rs
+++ b/tests/generated/preview2_udp_sample_application.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_udp_sample_application")?;
+    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 7840396f8..2a5aab662 100644
--- a/tests/generated/preview2_udp_sockopts.rs
+++ b/tests/generated/preview2_udp_sockopts.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_udp_sockopts")?;
+    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 6f71845b8..9525988fb 100644
--- a/tests/generated/preview2_udp_states.rs
+++ b/tests/generated/preview2_udp_states.rs
@@ -11,7 +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)?;
-    fs::remove_dir_all("./tests/rundir/preview2_udp_states")?;
+    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/xtask/src/generate/tests.rs b/xtask/src/generate/tests.rs
index 5c4599bf2..d8ed1184e 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![];
 
@@ -86,7 +87,7 @@ 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)?;
-    fs::remove_dir_all("./tests/rundir/{test_name}")?;
+    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(())
 }}

From bb18b9c3a79d013890b6c5275386d2ccb65dbc1b Mon Sep 17 00:00:00 2001
From: Guy Bedford <gbedford@fastly.com>
Date: Tue, 21 Nov 2023 16:38:06 -0800
Subject: [PATCH 4/8] more cases

---
 packages/preview2-shim/lib/io/worker-io.js    |  8 +-
 .../preview2-shim/lib/nodejs/filesystem.js    | 94 ++++++++++++-------
 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_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    |  2 +-
 tests/generated/preview1_clock_time_get.rs    |  2 +-
 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  |  2 +-
 tests/generated/preview1_directory_seek.rs    |  2 +-
 tests/generated/preview1_fd_advise.rs         |  2 +-
 tests/generated/preview1_fd_filestat_get.rs   |  2 +-
 tests/generated/preview1_fd_filestat_set.rs   |  2 +-
 tests/generated/preview1_fd_flags_set.rs      |  2 +-
 tests/generated/preview1_fd_readdir.rs        |  2 +-
 tests/generated/preview1_file_allocate.rs     |  2 +-
 tests/generated/preview1_file_pread_pwrite.rs |  2 +-
 tests/generated/preview1_file_seek_tell.rs    |  2 +-
 tests/generated/preview1_file_truncation.rs   |  2 +-
 .../preview1_file_unbuffered_write.rs         |  2 +-
 tests/generated/preview1_file_write.rs        |  2 +-
 tests/generated/preview1_interesting_paths.rs |  2 +-
 tests/generated/preview1_nofollow_errors.rs   |  2 +-
 tests/generated/preview1_overwrite_preopen.rs |  2 +-
 tests/generated/preview1_path_exists.rs       |  2 +-
 tests/generated/preview1_path_filestat.rs     |  2 +-
 tests/generated/preview1_path_link.rs         |  2 +-
 .../preview1_path_open_create_existing.rs     |  2 +-
 .../preview1_path_open_dirfd_not_dir.rs       |  2 +-
 tests/generated/preview1_path_open_missing.rs |  2 +-
 .../generated/preview1_path_open_nonblock.rs  |  2 +-
 tests/generated/preview1_path_open_preopen.rs |  2 +-
 .../preview1_path_open_read_write.rs          | 16 ++--
 tests/generated/preview1_path_rename.rs       |  2 +-
 ...eview1_path_rename_dir_trailing_slashes.rs |  2 +-
 ...view1_path_rename_file_trailing_slashes.rs |  2 +-
 .../preview1_path_symlink_trailing_slashes.rs |  2 +-
 tests/generated/preview1_poll_oneoff_files.rs |  2 +-
 tests/generated/preview1_poll_oneoff_stdio.rs |  2 +-
 tests/generated/preview1_readlink.rs          |  2 +-
 .../generated/preview1_regular_file_isatty.rs |  2 +-
 tests/generated/preview1_remove_directory.rs  |  2 +-
 ...view1_remove_directory_trailing_slashes.rs |  2 +-
 .../preview1_remove_nonempty_directory.rs     |  2 +-
 tests/generated/preview1_renumber.rs          |  2 +-
 tests/generated/preview1_sched_yield.rs       |  2 +-
 tests/generated/preview1_stdio.rs             |  2 +-
 tests/generated/preview1_stdio_isatty.rs      |  2 +-
 tests/generated/preview1_stdio_not_isatty.rs  |  2 +-
 tests/generated/preview1_symlink_create.rs    |  2 +-
 tests/generated/preview1_symlink_filestat.rs  |  2 +-
 tests/generated/preview1_symlink_loop.rs      |  2 +-
 tests/generated/preview1_unicode_output.rs    |  2 +-
 .../preview1_unlink_file_trailing_slashes.rs  |  2 +-
 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                  |  6 +-
 xtask/src/generate/tests.rs                   |  5 +-
 104 files changed, 186 insertions(+), 143 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 e9e26946b..78097bc7d 100644
--- a/packages/preview2-shim/lib/nodejs/filesystem.js
+++ b/packages/preview2-shim/lib/nodejs/filesystem.js
@@ -15,14 +15,18 @@ import {
   ftruncateSync,
   futimesSync,
   lstatSync,
+  lutimesSync,
   mkdirSync,
   opendirSync,
   openSync,
+  readlinkSync,
   readSync,
+  renameSync,
   rmdirSync,
   statSync,
   symlinkSync,
   unlinkSync,
+  utimesSync,
   writeSync,
 } from "node:fs";
 import { platform } from "node:process";
@@ -59,17 +63,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;
   }
@@ -115,22 +124,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.S_IRUSR) | (mode & constants.S_IRGRP) | (mode & constants.S_IROTH)) > 0,
-      write: ((mode & constants.S_IWUSR) | (mode & constants.S_IWGRP) | (mode & constants.S_IWOTH)) > 0,
-      // TODO:
-      fileIntegritySync: false,
-      dataIntegritySync: false,
-      requestedWriteSync: false,
-      mutateDirectory: false,
-    };
+    return this.#mode;
   }
 
   getType() {
@@ -162,7 +156,8 @@ class Descriptor {
     );
     const mtime = this.#getNewTimestamp(
       dataModificationTimestamp,
-      dataModificationTimestamp.tag === "no-change" && stats.dataModificationTimestamp
+      dataModificationTimestamp.tag === "no-change" &&
+        stats.dataModificationTimestamp
     );
     try {
       futimesSync(this.#fd, atime, mtime);
@@ -268,8 +263,32 @@ class Descriptor {
     };
   }
 
-  setTimesAt() {
-    // const fullPath = this.#getFullPath(path, false);
+  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() {
@@ -299,14 +318,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) {
@@ -318,8 +342,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) {
@@ -391,9 +421,7 @@ 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;
   }
@@ -548,10 +576,12 @@ function convertFsError(e) {
 }
 
 function timestampToMs(timestamp) {
-  let zeros = '';
+  let zeros = "";
   while (timestamp.nanoseconds < 10 ** (8 - zeros.length)) {
-    zeros += '0';
+    zeros += "0";
   }
-  const out = `${Number(timestamp.seconds) * 1000}.${zeros}${timestamp.nanoseconds}`;
+  const out = `${Number(timestamp.seconds) * 1000}.${zeros}${
+    timestamp.nanoseconds
+  }`;
   return out;
 }
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 36fda7d26..859dc318d 160000
--- a/submodules/wasmtime
+++ b/submodules/wasmtime
@@ -1 +1 @@
-Subproject commit 36fda7d265f63566050c833c2ffdbddef29665d0
+Subproject commit 859dc318de366223d61e251afa8b62bb920e4ff5
diff --git a/tests/generated/api_proxy.rs b/tests/generated/api_proxy.rs
index 8fa8f30c6..20a0fb839 100644
--- a/tests/generated/api_proxy.rs
+++ b/tests/generated/api_proxy.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn api_proxy() -> anyhow::Result<()> {
diff --git a/tests/generated/api_proxy_streaming.rs b/tests/generated/api_proxy_streaming.rs
index bac9b2cd6..c41fe91f2 100644
--- a/tests/generated/api_proxy_streaming.rs
+++ b/tests/generated/api_proxy_streaming.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn api_proxy_streaming() -> anyhow::Result<()> {
diff --git a/tests/generated/api_reactor.rs b/tests/generated/api_reactor.rs
index 9ee427b5a..868bf8274 100644
--- a/tests/generated/api_reactor.rs
+++ b/tests/generated/api_reactor.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn api_reactor() -> anyhow::Result<()> {
diff --git a/tests/generated/api_time.rs b/tests/generated/api_time.rs
index 7804809eb..34d397a3e 100644
--- a/tests/generated/api_time.rs
+++ b/tests/generated/api_time.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn api_time() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_args.rs b/tests/generated/cli_args.rs
index 7bf349567..b8d8d9d41 100644
--- a/tests/generated/cli_args.rs
+++ b/tests/generated/cli_args.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_args() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_default_clocks.rs b/tests/generated/cli_default_clocks.rs
index ccffefbe7..a627f7e71 100644
--- a/tests/generated/cli_default_clocks.rs
+++ b/tests/generated/cli_default_clocks.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_default_clocks() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_directory_list.rs b/tests/generated/cli_directory_list.rs
index 47d2bdca6..f45825978 100644
--- a/tests/generated/cli_directory_list.rs
+++ b/tests/generated/cli_directory_list.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_directory_list() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_env.rs b/tests/generated/cli_env.rs
index 83b33d0fd..b75cb5403 100644
--- a/tests/generated/cli_env.rs
+++ b/tests/generated/cli_env.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_env() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_default.rs b/tests/generated/cli_exit_default.rs
index 1a2620d7a..0014adf5e 100644
--- a/tests/generated/cli_exit_default.rs
+++ b/tests/generated/cli_exit_default.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_exit_default() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_failure.rs b/tests/generated/cli_exit_failure.rs
index 09d950ca1..3a0158b59 100644
--- a/tests/generated/cli_exit_failure.rs
+++ b/tests/generated/cli_exit_failure.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_exit_failure() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_panic.rs b/tests/generated/cli_exit_panic.rs
index 61acab4c2..db6504d94 100644
--- a/tests/generated/cli_exit_panic.rs
+++ b/tests/generated/cli_exit_panic.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_exit_panic() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_success.rs b/tests/generated/cli_exit_success.rs
index 42a74ae65..c24de88f1 100644
--- a/tests/generated/cli_exit_success.rs
+++ b/tests/generated/cli_exit_success.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_exit_success() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_export_cabi_realloc.rs b/tests/generated/cli_export_cabi_realloc.rs
index 5006a7384..25187bc3a 100644
--- a/tests/generated/cli_export_cabi_realloc.rs
+++ b/tests/generated/cli_export_cabi_realloc.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_export_cabi_realloc() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_append.rs b/tests/generated/cli_file_append.rs
index a59b5d0be..be2d2fee5 100644
--- a/tests/generated/cli_file_append.rs
+++ b/tests/generated/cli_file_append.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_file_append() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_dir_sync.rs b/tests/generated/cli_file_dir_sync.rs
index 0716394a2..6896e19eb 100644
--- a/tests/generated/cli_file_dir_sync.rs
+++ b/tests/generated/cli_file_dir_sync.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_file_dir_sync() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_read.rs b/tests/generated/cli_file_read.rs
index f2912e946..29569eb52 100644
--- a/tests/generated/cli_file_read.rs
+++ b/tests/generated/cli_file_read.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_file_read() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_hello_stdout.rs b/tests/generated/cli_hello_stdout.rs
index 3d3dc7634..ef1e0ebc9 100644
--- a/tests/generated/cli_hello_stdout.rs
+++ b/tests/generated/cli_hello_stdout.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_hello_stdout() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_splice_stdin.rs b/tests/generated/cli_splice_stdin.rs
index 3f19a6f42..d7aca7482 100644
--- a/tests/generated/cli_splice_stdin.rs
+++ b/tests/generated/cli_splice_stdin.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_splice_stdin() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_stdin.rs b/tests/generated/cli_stdin.rs
index e41c9d9c2..ce25dd2e2 100644
--- a/tests/generated/cli_stdin.rs
+++ b/tests/generated/cli_stdin.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_stdin() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_stdio_write_flushes.rs b/tests/generated/cli_stdio_write_flushes.rs
index dd10b6ebb..0dee52025 100644
--- a/tests/generated/cli_stdio_write_flushes.rs
+++ b/tests/generated/cli_stdio_write_flushes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_stdio_write_flushes() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_content_length.rs b/tests/generated/http_outbound_request_content_length.rs
index 38c8e9ad0..d6c4c82c8 100644
--- a/tests/generated/http_outbound_request_content_length.rs
+++ b/tests/generated/http_outbound_request_content_length.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_content_length() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_get.rs b/tests/generated/http_outbound_request_get.rs
index 73d7438c5..45f6f6d50 100644
--- a/tests/generated/http_outbound_request_get.rs
+++ b/tests/generated/http_outbound_request_get.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_get() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_dnsname.rs b/tests/generated/http_outbound_request_invalid_dnsname.rs
index afb667fee..f56a0bd1c 100644
--- a/tests/generated/http_outbound_request_invalid_dnsname.rs
+++ b/tests/generated/http_outbound_request_invalid_dnsname.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_dnsname() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_header.rs b/tests/generated/http_outbound_request_invalid_header.rs
index 5f492534b..7c972dcf1 100644
--- a/tests/generated/http_outbound_request_invalid_header.rs
+++ b/tests/generated/http_outbound_request_invalid_header.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_header() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_port.rs b/tests/generated/http_outbound_request_invalid_port.rs
index 81c687d52..a0a08cacd 100644
--- a/tests/generated/http_outbound_request_invalid_port.rs
+++ b/tests/generated/http_outbound_request_invalid_port.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_port() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_version.rs b/tests/generated/http_outbound_request_invalid_version.rs
index ce2c9cdc9..381ef8d06 100644
--- a/tests/generated/http_outbound_request_invalid_version.rs
+++ b/tests/generated/http_outbound_request_invalid_version.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_version() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_large_post.rs b/tests/generated/http_outbound_request_large_post.rs
index e709ab87f..47d3d91d7 100644
--- a/tests/generated/http_outbound_request_large_post.rs
+++ b/tests/generated/http_outbound_request_large_post.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_large_post() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_post.rs b/tests/generated/http_outbound_request_post.rs
index fce263ea6..3be696bc3 100644
--- a/tests/generated/http_outbound_request_post.rs
+++ b/tests/generated/http_outbound_request_post.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_post() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_put.rs b/tests/generated/http_outbound_request_put.rs
index 5410fbd47..1cb9db583 100644
--- a/tests/generated/http_outbound_request_put.rs
+++ b/tests/generated/http_outbound_request_put.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_put() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_response_build.rs b/tests/generated/http_outbound_request_response_build.rs
index 6c945b4bb..c32113b9c 100644
--- a/tests/generated/http_outbound_request_response_build.rs
+++ b/tests/generated/http_outbound_request_response_build.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_response_build() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_unknown_method.rs b/tests/generated/http_outbound_request_unknown_method.rs
index 12be199c2..179be4f1f 100644
--- a/tests/generated/http_outbound_request_unknown_method.rs
+++ b/tests/generated/http_outbound_request_unknown_method.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_unknown_method() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_unsupported_scheme.rs b/tests/generated/http_outbound_request_unsupported_scheme.rs
index 9e136f6a2..91e9167bf 100644
--- a/tests/generated/http_outbound_request_unsupported_scheme.rs
+++ b/tests/generated/http_outbound_request_unsupported_scheme.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_unsupported_scheme() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_big_random_buf.rs b/tests/generated/preview1_big_random_buf.rs
index ceeeb94c4..e50e26768 100644
--- a/tests/generated/preview1_big_random_buf.rs
+++ b/tests/generated/preview1_big_random_buf.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_big_random_buf() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_clock_time_get.rs b/tests/generated/preview1_clock_time_get.rs
index 8e6050a1e..e6a48f765 100644
--- a/tests/generated/preview1_clock_time_get.rs
+++ b/tests/generated/preview1_clock_time_get.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_clock_time_get() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_close_preopen.rs b/tests/generated/preview1_close_preopen.rs
index 77a18188c..19a1c5748 100644
--- a/tests/generated/preview1_close_preopen.rs
+++ b/tests/generated/preview1_close_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_close_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dangling_fd.rs b/tests/generated/preview1_dangling_fd.rs
index 0d897cb94..cb65e3c2c 100644
--- a/tests/generated/preview1_dangling_fd.rs
+++ b/tests/generated/preview1_dangling_fd.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_dangling_fd() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dangling_symlink.rs b/tests/generated/preview1_dangling_symlink.rs
index 293d70900..548e9524d 100644
--- a/tests/generated/preview1_dangling_symlink.rs
+++ b/tests/generated/preview1_dangling_symlink.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_dangling_symlink() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dir_fd_op_failures.rs b/tests/generated/preview1_dir_fd_op_failures.rs
index d4d992854..535a60c72 100644
--- a/tests/generated/preview1_dir_fd_op_failures.rs
+++ b/tests/generated/preview1_dir_fd_op_failures.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_dir_fd_op_failures() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_directory_seek.rs b/tests/generated/preview1_directory_seek.rs
index f7f92b325..0c506ca25 100644
--- a/tests/generated/preview1_directory_seek.rs
+++ b/tests/generated/preview1_directory_seek.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_directory_seek() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_advise.rs b/tests/generated/preview1_fd_advise.rs
index a3a21e84e..6175c977c 100644
--- a/tests/generated/preview1_fd_advise.rs
+++ b/tests/generated/preview1_fd_advise.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_advise() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_filestat_get.rs b/tests/generated/preview1_fd_filestat_get.rs
index 36e6d3f52..488d4ff97 100644
--- a/tests/generated/preview1_fd_filestat_get.rs
+++ b/tests/generated/preview1_fd_filestat_get.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_filestat_get() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_filestat_set.rs b/tests/generated/preview1_fd_filestat_set.rs
index 38b30705d..051ec6b27 100644
--- a/tests/generated/preview1_fd_filestat_set.rs
+++ b/tests/generated/preview1_fd_filestat_set.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_filestat_set() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_flags_set.rs b/tests/generated/preview1_fd_flags_set.rs
index ec6198467..19afb2200 100644
--- a/tests/generated/preview1_fd_flags_set.rs
+++ b/tests/generated/preview1_fd_flags_set.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_flags_set() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_readdir.rs b/tests/generated/preview1_fd_readdir.rs
index e330dc326..59b2560ba 100644
--- a/tests/generated/preview1_fd_readdir.rs
+++ b/tests/generated/preview1_fd_readdir.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_readdir() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_allocate.rs b/tests/generated/preview1_file_allocate.rs
index 2e66fb21f..0d706b9a8 100644
--- a/tests/generated/preview1_file_allocate.rs
+++ b/tests/generated/preview1_file_allocate.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_allocate() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_pread_pwrite.rs b/tests/generated/preview1_file_pread_pwrite.rs
index 0a223e8f0..691fc2480 100644
--- a/tests/generated/preview1_file_pread_pwrite.rs
+++ b/tests/generated/preview1_file_pread_pwrite.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_pread_pwrite() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_seek_tell.rs b/tests/generated/preview1_file_seek_tell.rs
index f63dcd42e..de76ea600 100644
--- a/tests/generated/preview1_file_seek_tell.rs
+++ b/tests/generated/preview1_file_seek_tell.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_seek_tell() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_truncation.rs b/tests/generated/preview1_file_truncation.rs
index 9644ff6be..27a6074f1 100644
--- a/tests/generated/preview1_file_truncation.rs
+++ b/tests/generated/preview1_file_truncation.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_truncation() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_unbuffered_write.rs b/tests/generated/preview1_file_unbuffered_write.rs
index 74550ef28..9b5b75d59 100644
--- a/tests/generated/preview1_file_unbuffered_write.rs
+++ b/tests/generated/preview1_file_unbuffered_write.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_unbuffered_write() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_write.rs b/tests/generated/preview1_file_write.rs
index 3bb115b53..fa46bcf60 100644
--- a/tests/generated/preview1_file_write.rs
+++ b/tests/generated/preview1_file_write.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_write() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_interesting_paths.rs b/tests/generated/preview1_interesting_paths.rs
index 51f267d7c..b512200c5 100644
--- a/tests/generated/preview1_interesting_paths.rs
+++ b/tests/generated/preview1_interesting_paths.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_interesting_paths() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_nofollow_errors.rs b/tests/generated/preview1_nofollow_errors.rs
index 2ee7530b6..29b3e8db5 100644
--- a/tests/generated/preview1_nofollow_errors.rs
+++ b/tests/generated/preview1_nofollow_errors.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_nofollow_errors() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_overwrite_preopen.rs b/tests/generated/preview1_overwrite_preopen.rs
index 8840e9d5f..3d60137b0 100644
--- a/tests/generated/preview1_overwrite_preopen.rs
+++ b/tests/generated/preview1_overwrite_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_overwrite_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_exists.rs b/tests/generated/preview1_path_exists.rs
index 61ae0f9f3..0bc55949b 100644
--- a/tests/generated/preview1_path_exists.rs
+++ b/tests/generated/preview1_path_exists.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_exists() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_filestat.rs b/tests/generated/preview1_path_filestat.rs
index 64f267101..4cb36aa17 100644
--- a/tests/generated/preview1_path_filestat.rs
+++ b/tests/generated/preview1_path_filestat.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_filestat() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_link.rs b/tests/generated/preview1_path_link.rs
index f236980ef..855a446ec 100644
--- a/tests/generated/preview1_path_link.rs
+++ b/tests/generated/preview1_path_link.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_link() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_create_existing.rs b/tests/generated/preview1_path_open_create_existing.rs
index 030c8f1fb..7caa30f3c 100644
--- a/tests/generated/preview1_path_open_create_existing.rs
+++ b/tests/generated/preview1_path_open_create_existing.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_create_existing() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_dirfd_not_dir.rs b/tests/generated/preview1_path_open_dirfd_not_dir.rs
index 1a493a151..24b246dbf 100644
--- a/tests/generated/preview1_path_open_dirfd_not_dir.rs
+++ b/tests/generated/preview1_path_open_dirfd_not_dir.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_dirfd_not_dir() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_missing.rs b/tests/generated/preview1_path_open_missing.rs
index 2a5e960b6..0e556eaf2 100644
--- a/tests/generated/preview1_path_open_missing.rs
+++ b/tests/generated/preview1_path_open_missing.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_missing() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_nonblock.rs b/tests/generated/preview1_path_open_nonblock.rs
index a4008f6ef..bfde91e8a 100644
--- a/tests/generated/preview1_path_open_nonblock.rs
+++ b/tests/generated/preview1_path_open_nonblock.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_nonblock() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_preopen.rs b/tests/generated/preview1_path_open_preopen.rs
index c8a173a1a..82a14771d 100644
--- a/tests/generated/preview1_path_open_preopen.rs
+++ b/tests/generated/preview1_path_open_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_read_write.rs b/tests/generated/preview1_path_open_read_write.rs
index ef4a150cf..00d0f36cd 100644
--- a/tests/generated/preview1_path_open_read_write.rs
+++ b/tests/generated/preview1_path_open_read_write.rs
@@ -1,17 +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)?;
+    // 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()?;
-    Ok(())
+    // 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 6f3d8f1aa..c08087bff 100644
--- a/tests/generated/preview1_path_rename.rs
+++ b/tests/generated/preview1_path_rename.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_rename() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
index 30f442217..af6228101 100644
--- a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_rename_dir_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename_file_trailing_slashes.rs b/tests/generated/preview1_path_rename_file_trailing_slashes.rs
index edac16b82..471b3b728 100644
--- a/tests/generated/preview1_path_rename_file_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_file_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_rename_file_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_symlink_trailing_slashes.rs b/tests/generated/preview1_path_symlink_trailing_slashes.rs
index 6e8324a87..93d02f2d3 100644
--- a/tests/generated/preview1_path_symlink_trailing_slashes.rs
+++ b/tests/generated/preview1_path_symlink_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_symlink_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_poll_oneoff_files.rs b/tests/generated/preview1_poll_oneoff_files.rs
index c65fa4152..a2440a865 100644
--- a/tests/generated/preview1_poll_oneoff_files.rs
+++ b/tests/generated/preview1_poll_oneoff_files.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_poll_oneoff_files() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_poll_oneoff_stdio.rs b/tests/generated/preview1_poll_oneoff_stdio.rs
index 0e0dac8f6..dbeb2631a 100644
--- a/tests/generated/preview1_poll_oneoff_stdio.rs
+++ b/tests/generated/preview1_poll_oneoff_stdio.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_poll_oneoff_stdio() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_readlink.rs b/tests/generated/preview1_readlink.rs
index b780dc908..33bc38640 100644
--- a/tests/generated/preview1_readlink.rs
+++ b/tests/generated/preview1_readlink.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_readlink() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_regular_file_isatty.rs b/tests/generated/preview1_regular_file_isatty.rs
index d1788fbdf..ffe42b6e3 100644
--- a/tests/generated/preview1_regular_file_isatty.rs
+++ b/tests/generated/preview1_regular_file_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_regular_file_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_directory.rs b/tests/generated/preview1_remove_directory.rs
index 138c472ff..40d3ee5f7 100644
--- a/tests/generated/preview1_remove_directory.rs
+++ b/tests/generated/preview1_remove_directory.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_remove_directory() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_directory_trailing_slashes.rs b/tests/generated/preview1_remove_directory_trailing_slashes.rs
index 26a077270..85941bbd7 100644
--- a/tests/generated/preview1_remove_directory_trailing_slashes.rs
+++ b/tests/generated/preview1_remove_directory_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_remove_directory_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_nonempty_directory.rs b/tests/generated/preview1_remove_nonempty_directory.rs
index 4668cdb86..a02a504dd 100644
--- a/tests/generated/preview1_remove_nonempty_directory.rs
+++ b/tests/generated/preview1_remove_nonempty_directory.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_remove_nonempty_directory() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_renumber.rs b/tests/generated/preview1_renumber.rs
index dea34672e..829b4f038 100644
--- a/tests/generated/preview1_renumber.rs
+++ b/tests/generated/preview1_renumber.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_renumber() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_sched_yield.rs b/tests/generated/preview1_sched_yield.rs
index e3def63d1..441f39343 100644
--- a/tests/generated/preview1_sched_yield.rs
+++ b/tests/generated/preview1_sched_yield.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_sched_yield() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio.rs b/tests/generated/preview1_stdio.rs
index 5f8f1f49b..2a347efdb 100644
--- a/tests/generated/preview1_stdio.rs
+++ b/tests/generated/preview1_stdio.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_stdio() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio_isatty.rs b/tests/generated/preview1_stdio_isatty.rs
index 41b75e2e6..c3c320ea7 100644
--- a/tests/generated/preview1_stdio_isatty.rs
+++ b/tests/generated/preview1_stdio_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_stdio_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio_not_isatty.rs b/tests/generated/preview1_stdio_not_isatty.rs
index 498004857..7e77f9ff9 100644
--- a/tests/generated/preview1_stdio_not_isatty.rs
+++ b/tests/generated/preview1_stdio_not_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_stdio_not_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_create.rs b/tests/generated/preview1_symlink_create.rs
index cb8609790..aa694d8ec 100644
--- a/tests/generated/preview1_symlink_create.rs
+++ b/tests/generated/preview1_symlink_create.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_symlink_create() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_filestat.rs b/tests/generated/preview1_symlink_filestat.rs
index 538532d71..be884c133 100644
--- a/tests/generated/preview1_symlink_filestat.rs
+++ b/tests/generated/preview1_symlink_filestat.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_symlink_filestat() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_loop.rs b/tests/generated/preview1_symlink_loop.rs
index 6d133f125..447708d79 100644
--- a/tests/generated/preview1_symlink_loop.rs
+++ b/tests/generated/preview1_symlink_loop.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_symlink_loop() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_unicode_output.rs b/tests/generated/preview1_unicode_output.rs
index 39680cadc..c3b60eb8b 100644
--- a/tests/generated/preview1_unicode_output.rs
+++ b/tests/generated/preview1_unicode_output.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_unicode_output() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_unlink_file_trailing_slashes.rs b/tests/generated/preview1_unlink_file_trailing_slashes.rs
index 14d8ccd29..3797f1d76 100644
--- a/tests/generated/preview1_unlink_file_trailing_slashes.rs
+++ b/tests/generated/preview1_unlink_file_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_unlink_file_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_ip_name_lookup.rs b/tests/generated/preview2_ip_name_lookup.rs
index e7450ccdb..832a9fe80 100644
--- a/tests/generated/preview2_ip_name_lookup.rs
+++ b/tests/generated/preview2_ip_name_lookup.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_ip_name_lookup() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_random.rs b/tests/generated/preview2_random.rs
index ff4f75543..148b433ac 100644
--- a/tests/generated/preview2_random.rs
+++ b/tests/generated/preview2_random.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_random() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_sleep.rs b/tests/generated/preview2_sleep.rs
index c8a7e2fdd..9431c7dcb 100644
--- a/tests/generated/preview2_sleep.rs
+++ b/tests/generated/preview2_sleep.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_sleep() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_stream_pollable_correct.rs b/tests/generated/preview2_stream_pollable_correct.rs
index 932170850..071e94911 100644
--- a/tests/generated/preview2_stream_pollable_correct.rs
+++ b/tests/generated/preview2_stream_pollable_correct.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_stream_pollable_correct() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_stream_pollable_traps.rs b/tests/generated/preview2_stream_pollable_traps.rs
index d9b68927f..7c1f6289f 100644
--- a/tests/generated/preview2_stream_pollable_traps.rs
+++ b/tests/generated/preview2_stream_pollable_traps.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_stream_pollable_traps() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_bind.rs b/tests/generated/preview2_tcp_bind.rs
index 55ac5ee1d..503a86f89 100644
--- a/tests/generated/preview2_tcp_bind.rs
+++ b/tests/generated/preview2_tcp_bind.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_bind() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_connect.rs b/tests/generated/preview2_tcp_connect.rs
index acba5b19d..c4b2ddab7 100644
--- a/tests/generated/preview2_tcp_connect.rs
+++ b/tests/generated/preview2_tcp_connect.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_connect() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_sample_application.rs b/tests/generated/preview2_tcp_sample_application.rs
index 9cf3a8406..da19eb861 100644
--- a/tests/generated/preview2_tcp_sample_application.rs
+++ b/tests/generated/preview2_tcp_sample_application.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_sample_application() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_sockopts.rs b/tests/generated/preview2_tcp_sockopts.rs
index 4dbadfa5f..f661da6d2 100644
--- a/tests/generated/preview2_tcp_sockopts.rs
+++ b/tests/generated/preview2_tcp_sockopts.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_sockopts() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_states.rs b/tests/generated/preview2_tcp_states.rs
index e1b9786a8..08b4e900f 100644
--- a/tests/generated/preview2_tcp_states.rs
+++ b/tests/generated/preview2_tcp_states.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_states() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_bind.rs b/tests/generated/preview2_udp_bind.rs
index 9c55bf139..5bb29a27a 100644
--- a/tests/generated/preview2_udp_bind.rs
+++ b/tests/generated/preview2_udp_bind.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_bind() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_connect.rs b/tests/generated/preview2_udp_connect.rs
index 7a58a5e7d..bfd72a69f 100644
--- a/tests/generated/preview2_udp_connect.rs
+++ b/tests/generated/preview2_udp_connect.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_connect() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_sample_application.rs b/tests/generated/preview2_udp_sample_application.rs
index 4c1b2c959..76004653e 100644
--- a/tests/generated/preview2_udp_sample_application.rs
+++ b/tests/generated/preview2_udp_sample_application.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_sample_application() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_sockopts.rs b/tests/generated/preview2_udp_sockopts.rs
index 2a5aab662..20c0e7fb1 100644
--- a/tests/generated/preview2_udp_sockopts.rs
+++ b/tests/generated/preview2_udp_sockopts.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_sockopts() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_states.rs b/tests/generated/preview2_udp_states.rs
index 9525988fb..855f82eca 100644
--- a/tests/generated/preview2_udp_states.rs
+++ b/tests/generated/preview2_udp_states.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_states() -> anyhow::Result<()> {
diff --git a/tests/virtualenvs/scratch.js b/tests/virtualenvs/scratch.js
index 708af2092..e55912d30 100644
--- a/tests/virtualenvs/scratch.js
+++ b/tests/virtualenvs/scratch.js
@@ -1,9 +1,13 @@
-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"
+});
+
 _setArgs(['_', '/']);
 
 export const testDir = await mkdtemp(tmpdir());
diff --git a/xtask/src/generate/tests.rs b/xtask/src/generate/tests.rs
index d8ed1184e..f86621120 100644
--- a/xtask/src/generate/tests.rs
+++ b/xtask/src/generate/tests.rs
@@ -68,8 +68,9 @@ fn generate_test(test_name: &str) -> String {
         _ => 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 { "" };

From 6c2c6558697eabcaa6da242c3420bba0f3b090bb Mon Sep 17 00:00:00 2001
From: Guy Bedford <gbedford@fastly.com>
Date: Tue, 21 Nov 2023 16:40:47 -0800
Subject: [PATCH 5/8] regen

---
 tests/generated/api_proxy.rs                                  | 2 +-
 tests/generated/api_proxy_streaming.rs                        | 2 +-
 tests/generated/api_reactor.rs                                | 2 +-
 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 +-
 tests/generated/http_outbound_request_content_length.rs       | 2 +-
 tests/generated/http_outbound_request_get.rs                  | 2 +-
 tests/generated/http_outbound_request_invalid_dnsname.rs      | 2 +-
 tests/generated/http_outbound_request_invalid_header.rs       | 2 +-
 tests/generated/http_outbound_request_invalid_port.rs         | 2 +-
 tests/generated/http_outbound_request_invalid_version.rs      | 2 +-
 tests/generated/http_outbound_request_large_post.rs           | 2 +-
 tests/generated/http_outbound_request_post.rs                 | 2 +-
 tests/generated/http_outbound_request_put.rs                  | 2 +-
 tests/generated/http_outbound_request_response_build.rs       | 2 +-
 tests/generated/http_outbound_request_unknown_method.rs       | 2 +-
 tests/generated/http_outbound_request_unsupported_scheme.rs   | 2 +-
 tests/generated/preview1_big_random_buf.rs                    | 2 +-
 tests/generated/preview1_clock_time_get.rs                    | 2 +-
 tests/generated/preview1_close_preopen.rs                     | 2 +-
 tests/generated/preview1_dangling_fd.rs                       | 2 +-
 tests/generated/preview1_dangling_symlink.rs                  | 2 +-
 tests/generated/preview1_dir_fd_op_failures.rs                | 2 +-
 tests/generated/preview1_directory_seek.rs                    | 2 +-
 tests/generated/preview1_fd_advise.rs                         | 2 +-
 tests/generated/preview1_fd_filestat_get.rs                   | 2 +-
 tests/generated/preview1_fd_filestat_set.rs                   | 2 +-
 tests/generated/preview1_fd_flags_set.rs                      | 2 +-
 tests/generated/preview1_fd_readdir.rs                        | 2 +-
 tests/generated/preview1_file_allocate.rs                     | 2 +-
 tests/generated/preview1_file_pread_pwrite.rs                 | 2 +-
 tests/generated/preview1_file_seek_tell.rs                    | 2 +-
 tests/generated/preview1_file_truncation.rs                   | 2 +-
 tests/generated/preview1_file_unbuffered_write.rs             | 2 +-
 tests/generated/preview1_file_write.rs                        | 2 +-
 tests/generated/preview1_interesting_paths.rs                 | 2 +-
 tests/generated/preview1_nofollow_errors.rs                   | 2 +-
 tests/generated/preview1_overwrite_preopen.rs                 | 2 +-
 tests/generated/preview1_path_exists.rs                       | 2 +-
 tests/generated/preview1_path_filestat.rs                     | 2 +-
 tests/generated/preview1_path_link.rs                         | 2 +-
 tests/generated/preview1_path_open_create_existing.rs         | 2 +-
 tests/generated/preview1_path_open_dirfd_not_dir.rs           | 2 +-
 tests/generated/preview1_path_open_missing.rs                 | 2 +-
 tests/generated/preview1_path_open_nonblock.rs                | 2 +-
 tests/generated/preview1_path_open_preopen.rs                 | 2 +-
 tests/generated/preview1_path_rename.rs                       | 2 +-
 tests/generated/preview1_path_rename_dir_trailing_slashes.rs  | 2 +-
 tests/generated/preview1_path_rename_file_trailing_slashes.rs | 2 +-
 tests/generated/preview1_path_symlink_trailing_slashes.rs     | 2 +-
 tests/generated/preview1_poll_oneoff_files.rs                 | 2 +-
 tests/generated/preview1_poll_oneoff_stdio.rs                 | 2 +-
 tests/generated/preview1_readlink.rs                          | 2 +-
 tests/generated/preview1_regular_file_isatty.rs               | 2 +-
 tests/generated/preview1_remove_directory.rs                  | 2 +-
 tests/generated/preview1_remove_directory_trailing_slashes.rs | 2 +-
 tests/generated/preview1_remove_nonempty_directory.rs         | 2 +-
 tests/generated/preview1_renumber.rs                          | 2 +-
 tests/generated/preview1_sched_yield.rs                       | 2 +-
 tests/generated/preview1_stdio.rs                             | 2 +-
 tests/generated/preview1_stdio_isatty.rs                      | 2 +-
 tests/generated/preview1_stdio_not_isatty.rs                  | 2 +-
 tests/generated/preview1_symlink_create.rs                    | 2 +-
 tests/generated/preview1_symlink_filestat.rs                  | 2 +-
 tests/generated/preview1_symlink_loop.rs                      | 2 +-
 tests/generated/preview1_unicode_output.rs                    | 2 +-
 tests/generated/preview1_unlink_file_trailing_slashes.rs      | 2 +-
 tests/generated/preview2_ip_name_lookup.rs                    | 2 +-
 tests/generated/preview2_random.rs                            | 2 +-
 tests/generated/preview2_sleep.rs                             | 2 +-
 tests/generated/preview2_stream_pollable_correct.rs           | 2 +-
 tests/generated/preview2_stream_pollable_traps.rs             | 2 +-
 tests/generated/preview2_tcp_bind.rs                          | 2 +-
 tests/generated/preview2_tcp_connect.rs                       | 2 +-
 tests/generated/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 +-
 tests/generated/preview2_udp_sample_application.rs            | 2 +-
 tests/generated/preview2_udp_sockopts.rs                      | 2 +-
 tests/generated/preview2_udp_states.rs                        | 2 +-
 xtask/src/generate/tests.rs                                   | 3 +--
 98 files changed, 98 insertions(+), 99 deletions(-)

diff --git a/tests/generated/api_proxy.rs b/tests/generated/api_proxy.rs
index 20a0fb839..8fa8f30c6 100644
--- a/tests/generated/api_proxy.rs
+++ b/tests/generated/api_proxy.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn api_proxy() -> anyhow::Result<()> {
diff --git a/tests/generated/api_proxy_streaming.rs b/tests/generated/api_proxy_streaming.rs
index c41fe91f2..bac9b2cd6 100644
--- a/tests/generated/api_proxy_streaming.rs
+++ b/tests/generated/api_proxy_streaming.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn api_proxy_streaming() -> anyhow::Result<()> {
diff --git a/tests/generated/api_reactor.rs b/tests/generated/api_reactor.rs
index 868bf8274..9ee427b5a 100644
--- a/tests/generated/api_reactor.rs
+++ b/tests/generated/api_reactor.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn api_reactor() -> anyhow::Result<()> {
diff --git a/tests/generated/api_time.rs b/tests/generated/api_time.rs
index 34d397a3e..7804809eb 100644
--- a/tests/generated/api_time.rs
+++ b/tests/generated/api_time.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn api_time() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_args.rs b/tests/generated/cli_args.rs
index b8d8d9d41..7bf349567 100644
--- a/tests/generated/cli_args.rs
+++ b/tests/generated/cli_args.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_args() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_default_clocks.rs b/tests/generated/cli_default_clocks.rs
index a627f7e71..ccffefbe7 100644
--- a/tests/generated/cli_default_clocks.rs
+++ b/tests/generated/cli_default_clocks.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_default_clocks() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_directory_list.rs b/tests/generated/cli_directory_list.rs
index f45825978..47d2bdca6 100644
--- a/tests/generated/cli_directory_list.rs
+++ b/tests/generated/cli_directory_list.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_directory_list() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_env.rs b/tests/generated/cli_env.rs
index b75cb5403..83b33d0fd 100644
--- a/tests/generated/cli_env.rs
+++ b/tests/generated/cli_env.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_env() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_default.rs b/tests/generated/cli_exit_default.rs
index 0014adf5e..1a2620d7a 100644
--- a/tests/generated/cli_exit_default.rs
+++ b/tests/generated/cli_exit_default.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_exit_default() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_failure.rs b/tests/generated/cli_exit_failure.rs
index 3a0158b59..09d950ca1 100644
--- a/tests/generated/cli_exit_failure.rs
+++ b/tests/generated/cli_exit_failure.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_exit_failure() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_panic.rs b/tests/generated/cli_exit_panic.rs
index db6504d94..61acab4c2 100644
--- a/tests/generated/cli_exit_panic.rs
+++ b/tests/generated/cli_exit_panic.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_exit_panic() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_success.rs b/tests/generated/cli_exit_success.rs
index c24de88f1..42a74ae65 100644
--- a/tests/generated/cli_exit_success.rs
+++ b/tests/generated/cli_exit_success.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_exit_success() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_export_cabi_realloc.rs b/tests/generated/cli_export_cabi_realloc.rs
index 25187bc3a..5006a7384 100644
--- a/tests/generated/cli_export_cabi_realloc.rs
+++ b/tests/generated/cli_export_cabi_realloc.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_export_cabi_realloc() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_append.rs b/tests/generated/cli_file_append.rs
index be2d2fee5..a59b5d0be 100644
--- a/tests/generated/cli_file_append.rs
+++ b/tests/generated/cli_file_append.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_file_append() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_dir_sync.rs b/tests/generated/cli_file_dir_sync.rs
index 6896e19eb..0716394a2 100644
--- a/tests/generated/cli_file_dir_sync.rs
+++ b/tests/generated/cli_file_dir_sync.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_file_dir_sync() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_read.rs b/tests/generated/cli_file_read.rs
index 29569eb52..f2912e946 100644
--- a/tests/generated/cli_file_read.rs
+++ b/tests/generated/cli_file_read.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_file_read() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_hello_stdout.rs b/tests/generated/cli_hello_stdout.rs
index ef1e0ebc9..3d3dc7634 100644
--- a/tests/generated/cli_hello_stdout.rs
+++ b/tests/generated/cli_hello_stdout.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_hello_stdout() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_splice_stdin.rs b/tests/generated/cli_splice_stdin.rs
index d7aca7482..3f19a6f42 100644
--- a/tests/generated/cli_splice_stdin.rs
+++ b/tests/generated/cli_splice_stdin.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_splice_stdin() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_stdin.rs b/tests/generated/cli_stdin.rs
index ce25dd2e2..e41c9d9c2 100644
--- a/tests/generated/cli_stdin.rs
+++ b/tests/generated/cli_stdin.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_stdin() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_stdio_write_flushes.rs b/tests/generated/cli_stdio_write_flushes.rs
index 0dee52025..dd10b6ebb 100644
--- a/tests/generated/cli_stdio_write_flushes.rs
+++ b/tests/generated/cli_stdio_write_flushes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_stdio_write_flushes() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_content_length.rs b/tests/generated/http_outbound_request_content_length.rs
index d6c4c82c8..38c8e9ad0 100644
--- a/tests/generated/http_outbound_request_content_length.rs
+++ b/tests/generated/http_outbound_request_content_length.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_content_length() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_get.rs b/tests/generated/http_outbound_request_get.rs
index 45f6f6d50..73d7438c5 100644
--- a/tests/generated/http_outbound_request_get.rs
+++ b/tests/generated/http_outbound_request_get.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_get() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_dnsname.rs b/tests/generated/http_outbound_request_invalid_dnsname.rs
index f56a0bd1c..afb667fee 100644
--- a/tests/generated/http_outbound_request_invalid_dnsname.rs
+++ b/tests/generated/http_outbound_request_invalid_dnsname.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_dnsname() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_header.rs b/tests/generated/http_outbound_request_invalid_header.rs
index 7c972dcf1..5f492534b 100644
--- a/tests/generated/http_outbound_request_invalid_header.rs
+++ b/tests/generated/http_outbound_request_invalid_header.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_header() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_port.rs b/tests/generated/http_outbound_request_invalid_port.rs
index a0a08cacd..81c687d52 100644
--- a/tests/generated/http_outbound_request_invalid_port.rs
+++ b/tests/generated/http_outbound_request_invalid_port.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_port() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_version.rs b/tests/generated/http_outbound_request_invalid_version.rs
index 381ef8d06..ce2c9cdc9 100644
--- a/tests/generated/http_outbound_request_invalid_version.rs
+++ b/tests/generated/http_outbound_request_invalid_version.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_version() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_large_post.rs b/tests/generated/http_outbound_request_large_post.rs
index 47d3d91d7..e709ab87f 100644
--- a/tests/generated/http_outbound_request_large_post.rs
+++ b/tests/generated/http_outbound_request_large_post.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_large_post() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_post.rs b/tests/generated/http_outbound_request_post.rs
index 3be696bc3..fce263ea6 100644
--- a/tests/generated/http_outbound_request_post.rs
+++ b/tests/generated/http_outbound_request_post.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_post() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_put.rs b/tests/generated/http_outbound_request_put.rs
index 1cb9db583..5410fbd47 100644
--- a/tests/generated/http_outbound_request_put.rs
+++ b/tests/generated/http_outbound_request_put.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_put() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_response_build.rs b/tests/generated/http_outbound_request_response_build.rs
index c32113b9c..6c945b4bb 100644
--- a/tests/generated/http_outbound_request_response_build.rs
+++ b/tests/generated/http_outbound_request_response_build.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_response_build() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_unknown_method.rs b/tests/generated/http_outbound_request_unknown_method.rs
index 179be4f1f..12be199c2 100644
--- a/tests/generated/http_outbound_request_unknown_method.rs
+++ b/tests/generated/http_outbound_request_unknown_method.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_unknown_method() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_unsupported_scheme.rs b/tests/generated/http_outbound_request_unsupported_scheme.rs
index 91e9167bf..9e136f6a2 100644
--- a/tests/generated/http_outbound_request_unsupported_scheme.rs
+++ b/tests/generated/http_outbound_request_unsupported_scheme.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_unsupported_scheme() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_big_random_buf.rs b/tests/generated/preview1_big_random_buf.rs
index e50e26768..ceeeb94c4 100644
--- a/tests/generated/preview1_big_random_buf.rs
+++ b/tests/generated/preview1_big_random_buf.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_big_random_buf() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_clock_time_get.rs b/tests/generated/preview1_clock_time_get.rs
index e6a48f765..8e6050a1e 100644
--- a/tests/generated/preview1_clock_time_get.rs
+++ b/tests/generated/preview1_clock_time_get.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_clock_time_get() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_close_preopen.rs b/tests/generated/preview1_close_preopen.rs
index 19a1c5748..77a18188c 100644
--- a/tests/generated/preview1_close_preopen.rs
+++ b/tests/generated/preview1_close_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_close_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dangling_fd.rs b/tests/generated/preview1_dangling_fd.rs
index cb65e3c2c..0d897cb94 100644
--- a/tests/generated/preview1_dangling_fd.rs
+++ b/tests/generated/preview1_dangling_fd.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_dangling_fd() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dangling_symlink.rs b/tests/generated/preview1_dangling_symlink.rs
index 548e9524d..293d70900 100644
--- a/tests/generated/preview1_dangling_symlink.rs
+++ b/tests/generated/preview1_dangling_symlink.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_dangling_symlink() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dir_fd_op_failures.rs b/tests/generated/preview1_dir_fd_op_failures.rs
index 535a60c72..d4d992854 100644
--- a/tests/generated/preview1_dir_fd_op_failures.rs
+++ b/tests/generated/preview1_dir_fd_op_failures.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_dir_fd_op_failures() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_directory_seek.rs b/tests/generated/preview1_directory_seek.rs
index 0c506ca25..f7f92b325 100644
--- a/tests/generated/preview1_directory_seek.rs
+++ b/tests/generated/preview1_directory_seek.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_directory_seek() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_advise.rs b/tests/generated/preview1_fd_advise.rs
index 6175c977c..a3a21e84e 100644
--- a/tests/generated/preview1_fd_advise.rs
+++ b/tests/generated/preview1_fd_advise.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_advise() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_filestat_get.rs b/tests/generated/preview1_fd_filestat_get.rs
index 488d4ff97..36e6d3f52 100644
--- a/tests/generated/preview1_fd_filestat_get.rs
+++ b/tests/generated/preview1_fd_filestat_get.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_filestat_get() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_filestat_set.rs b/tests/generated/preview1_fd_filestat_set.rs
index 051ec6b27..38b30705d 100644
--- a/tests/generated/preview1_fd_filestat_set.rs
+++ b/tests/generated/preview1_fd_filestat_set.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_filestat_set() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_flags_set.rs b/tests/generated/preview1_fd_flags_set.rs
index 19afb2200..ec6198467 100644
--- a/tests/generated/preview1_fd_flags_set.rs
+++ b/tests/generated/preview1_fd_flags_set.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_flags_set() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_readdir.rs b/tests/generated/preview1_fd_readdir.rs
index 59b2560ba..e330dc326 100644
--- a/tests/generated/preview1_fd_readdir.rs
+++ b/tests/generated/preview1_fd_readdir.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_readdir() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_allocate.rs b/tests/generated/preview1_file_allocate.rs
index 0d706b9a8..2e66fb21f 100644
--- a/tests/generated/preview1_file_allocate.rs
+++ b/tests/generated/preview1_file_allocate.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_allocate() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_pread_pwrite.rs b/tests/generated/preview1_file_pread_pwrite.rs
index 691fc2480..0a223e8f0 100644
--- a/tests/generated/preview1_file_pread_pwrite.rs
+++ b/tests/generated/preview1_file_pread_pwrite.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_pread_pwrite() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_seek_tell.rs b/tests/generated/preview1_file_seek_tell.rs
index de76ea600..f63dcd42e 100644
--- a/tests/generated/preview1_file_seek_tell.rs
+++ b/tests/generated/preview1_file_seek_tell.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_seek_tell() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_truncation.rs b/tests/generated/preview1_file_truncation.rs
index 27a6074f1..9644ff6be 100644
--- a/tests/generated/preview1_file_truncation.rs
+++ b/tests/generated/preview1_file_truncation.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_truncation() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_unbuffered_write.rs b/tests/generated/preview1_file_unbuffered_write.rs
index 9b5b75d59..74550ef28 100644
--- a/tests/generated/preview1_file_unbuffered_write.rs
+++ b/tests/generated/preview1_file_unbuffered_write.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_unbuffered_write() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_write.rs b/tests/generated/preview1_file_write.rs
index fa46bcf60..3bb115b53 100644
--- a/tests/generated/preview1_file_write.rs
+++ b/tests/generated/preview1_file_write.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_write() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_interesting_paths.rs b/tests/generated/preview1_interesting_paths.rs
index b512200c5..51f267d7c 100644
--- a/tests/generated/preview1_interesting_paths.rs
+++ b/tests/generated/preview1_interesting_paths.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_interesting_paths() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_nofollow_errors.rs b/tests/generated/preview1_nofollow_errors.rs
index 29b3e8db5..2ee7530b6 100644
--- a/tests/generated/preview1_nofollow_errors.rs
+++ b/tests/generated/preview1_nofollow_errors.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_nofollow_errors() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_overwrite_preopen.rs b/tests/generated/preview1_overwrite_preopen.rs
index 3d60137b0..8840e9d5f 100644
--- a/tests/generated/preview1_overwrite_preopen.rs
+++ b/tests/generated/preview1_overwrite_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_overwrite_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_exists.rs b/tests/generated/preview1_path_exists.rs
index 0bc55949b..61ae0f9f3 100644
--- a/tests/generated/preview1_path_exists.rs
+++ b/tests/generated/preview1_path_exists.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_exists() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_filestat.rs b/tests/generated/preview1_path_filestat.rs
index 4cb36aa17..64f267101 100644
--- a/tests/generated/preview1_path_filestat.rs
+++ b/tests/generated/preview1_path_filestat.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_filestat() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_link.rs b/tests/generated/preview1_path_link.rs
index 855a446ec..f236980ef 100644
--- a/tests/generated/preview1_path_link.rs
+++ b/tests/generated/preview1_path_link.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_link() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_create_existing.rs b/tests/generated/preview1_path_open_create_existing.rs
index 7caa30f3c..030c8f1fb 100644
--- a/tests/generated/preview1_path_open_create_existing.rs
+++ b/tests/generated/preview1_path_open_create_existing.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_create_existing() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_dirfd_not_dir.rs b/tests/generated/preview1_path_open_dirfd_not_dir.rs
index 24b246dbf..1a493a151 100644
--- a/tests/generated/preview1_path_open_dirfd_not_dir.rs
+++ b/tests/generated/preview1_path_open_dirfd_not_dir.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_dirfd_not_dir() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_missing.rs b/tests/generated/preview1_path_open_missing.rs
index 0e556eaf2..2a5e960b6 100644
--- a/tests/generated/preview1_path_open_missing.rs
+++ b/tests/generated/preview1_path_open_missing.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_missing() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_nonblock.rs b/tests/generated/preview1_path_open_nonblock.rs
index bfde91e8a..a4008f6ef 100644
--- a/tests/generated/preview1_path_open_nonblock.rs
+++ b/tests/generated/preview1_path_open_nonblock.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_nonblock() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_preopen.rs b/tests/generated/preview1_path_open_preopen.rs
index 82a14771d..c8a173a1a 100644
--- a/tests/generated/preview1_path_open_preopen.rs
+++ b/tests/generated/preview1_path_open_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename.rs b/tests/generated/preview1_path_rename.rs
index c08087bff..6f3d8f1aa 100644
--- a/tests/generated/preview1_path_rename.rs
+++ b/tests/generated/preview1_path_rename.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_rename() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
index af6228101..30f442217 100644
--- a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_rename_dir_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename_file_trailing_slashes.rs b/tests/generated/preview1_path_rename_file_trailing_slashes.rs
index 471b3b728..edac16b82 100644
--- a/tests/generated/preview1_path_rename_file_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_file_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_rename_file_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_symlink_trailing_slashes.rs b/tests/generated/preview1_path_symlink_trailing_slashes.rs
index 93d02f2d3..6e8324a87 100644
--- a/tests/generated/preview1_path_symlink_trailing_slashes.rs
+++ b/tests/generated/preview1_path_symlink_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_symlink_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_poll_oneoff_files.rs b/tests/generated/preview1_poll_oneoff_files.rs
index a2440a865..c65fa4152 100644
--- a/tests/generated/preview1_poll_oneoff_files.rs
+++ b/tests/generated/preview1_poll_oneoff_files.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_poll_oneoff_files() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_poll_oneoff_stdio.rs b/tests/generated/preview1_poll_oneoff_stdio.rs
index dbeb2631a..0e0dac8f6 100644
--- a/tests/generated/preview1_poll_oneoff_stdio.rs
+++ b/tests/generated/preview1_poll_oneoff_stdio.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_poll_oneoff_stdio() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_readlink.rs b/tests/generated/preview1_readlink.rs
index 33bc38640..b780dc908 100644
--- a/tests/generated/preview1_readlink.rs
+++ b/tests/generated/preview1_readlink.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_readlink() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_regular_file_isatty.rs b/tests/generated/preview1_regular_file_isatty.rs
index ffe42b6e3..d1788fbdf 100644
--- a/tests/generated/preview1_regular_file_isatty.rs
+++ b/tests/generated/preview1_regular_file_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_regular_file_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_directory.rs b/tests/generated/preview1_remove_directory.rs
index 40d3ee5f7..138c472ff 100644
--- a/tests/generated/preview1_remove_directory.rs
+++ b/tests/generated/preview1_remove_directory.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_remove_directory() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_directory_trailing_slashes.rs b/tests/generated/preview1_remove_directory_trailing_slashes.rs
index 85941bbd7..26a077270 100644
--- a/tests/generated/preview1_remove_directory_trailing_slashes.rs
+++ b/tests/generated/preview1_remove_directory_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_remove_directory_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_nonempty_directory.rs b/tests/generated/preview1_remove_nonempty_directory.rs
index a02a504dd..4668cdb86 100644
--- a/tests/generated/preview1_remove_nonempty_directory.rs
+++ b/tests/generated/preview1_remove_nonempty_directory.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_remove_nonempty_directory() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_renumber.rs b/tests/generated/preview1_renumber.rs
index 829b4f038..dea34672e 100644
--- a/tests/generated/preview1_renumber.rs
+++ b/tests/generated/preview1_renumber.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_renumber() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_sched_yield.rs b/tests/generated/preview1_sched_yield.rs
index 441f39343..e3def63d1 100644
--- a/tests/generated/preview1_sched_yield.rs
+++ b/tests/generated/preview1_sched_yield.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_sched_yield() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio.rs b/tests/generated/preview1_stdio.rs
index 2a347efdb..5f8f1f49b 100644
--- a/tests/generated/preview1_stdio.rs
+++ b/tests/generated/preview1_stdio.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_stdio() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio_isatty.rs b/tests/generated/preview1_stdio_isatty.rs
index c3c320ea7..41b75e2e6 100644
--- a/tests/generated/preview1_stdio_isatty.rs
+++ b/tests/generated/preview1_stdio_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_stdio_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio_not_isatty.rs b/tests/generated/preview1_stdio_not_isatty.rs
index 7e77f9ff9..498004857 100644
--- a/tests/generated/preview1_stdio_not_isatty.rs
+++ b/tests/generated/preview1_stdio_not_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_stdio_not_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_create.rs b/tests/generated/preview1_symlink_create.rs
index aa694d8ec..cb8609790 100644
--- a/tests/generated/preview1_symlink_create.rs
+++ b/tests/generated/preview1_symlink_create.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_symlink_create() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_filestat.rs b/tests/generated/preview1_symlink_filestat.rs
index be884c133..538532d71 100644
--- a/tests/generated/preview1_symlink_filestat.rs
+++ b/tests/generated/preview1_symlink_filestat.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_symlink_filestat() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_loop.rs b/tests/generated/preview1_symlink_loop.rs
index 447708d79..6d133f125 100644
--- a/tests/generated/preview1_symlink_loop.rs
+++ b/tests/generated/preview1_symlink_loop.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_symlink_loop() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_unicode_output.rs b/tests/generated/preview1_unicode_output.rs
index c3b60eb8b..39680cadc 100644
--- a/tests/generated/preview1_unicode_output.rs
+++ b/tests/generated/preview1_unicode_output.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_unicode_output() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_unlink_file_trailing_slashes.rs b/tests/generated/preview1_unlink_file_trailing_slashes.rs
index 3797f1d76..14d8ccd29 100644
--- a/tests/generated/preview1_unlink_file_trailing_slashes.rs
+++ b/tests/generated/preview1_unlink_file_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_unlink_file_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_ip_name_lookup.rs b/tests/generated/preview2_ip_name_lookup.rs
index 832a9fe80..e7450ccdb 100644
--- a/tests/generated/preview2_ip_name_lookup.rs
+++ b/tests/generated/preview2_ip_name_lookup.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_ip_name_lookup() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_random.rs b/tests/generated/preview2_random.rs
index 148b433ac..ff4f75543 100644
--- a/tests/generated/preview2_random.rs
+++ b/tests/generated/preview2_random.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_random() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_sleep.rs b/tests/generated/preview2_sleep.rs
index 9431c7dcb..c8a7e2fdd 100644
--- a/tests/generated/preview2_sleep.rs
+++ b/tests/generated/preview2_sleep.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_sleep() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_stream_pollable_correct.rs b/tests/generated/preview2_stream_pollable_correct.rs
index 071e94911..932170850 100644
--- a/tests/generated/preview2_stream_pollable_correct.rs
+++ b/tests/generated/preview2_stream_pollable_correct.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_stream_pollable_correct() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_stream_pollable_traps.rs b/tests/generated/preview2_stream_pollable_traps.rs
index 7c1f6289f..d9b68927f 100644
--- a/tests/generated/preview2_stream_pollable_traps.rs
+++ b/tests/generated/preview2_stream_pollable_traps.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_stream_pollable_traps() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_bind.rs b/tests/generated/preview2_tcp_bind.rs
index 503a86f89..55ac5ee1d 100644
--- a/tests/generated/preview2_tcp_bind.rs
+++ b/tests/generated/preview2_tcp_bind.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_bind() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_connect.rs b/tests/generated/preview2_tcp_connect.rs
index c4b2ddab7..acba5b19d 100644
--- a/tests/generated/preview2_tcp_connect.rs
+++ b/tests/generated/preview2_tcp_connect.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_connect() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_sample_application.rs b/tests/generated/preview2_tcp_sample_application.rs
index da19eb861..9cf3a8406 100644
--- a/tests/generated/preview2_tcp_sample_application.rs
+++ b/tests/generated/preview2_tcp_sample_application.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_sample_application() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_sockopts.rs b/tests/generated/preview2_tcp_sockopts.rs
index f661da6d2..4dbadfa5f 100644
--- a/tests/generated/preview2_tcp_sockopts.rs
+++ b/tests/generated/preview2_tcp_sockopts.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_sockopts() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_states.rs b/tests/generated/preview2_tcp_states.rs
index 08b4e900f..e1b9786a8 100644
--- a/tests/generated/preview2_tcp_states.rs
+++ b/tests/generated/preview2_tcp_states.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_states() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_bind.rs b/tests/generated/preview2_udp_bind.rs
index 5bb29a27a..9c55bf139 100644
--- a/tests/generated/preview2_udp_bind.rs
+++ b/tests/generated/preview2_udp_bind.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_bind() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_connect.rs b/tests/generated/preview2_udp_connect.rs
index bfd72a69f..7a58a5e7d 100644
--- a/tests/generated/preview2_udp_connect.rs
+++ b/tests/generated/preview2_udp_connect.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_connect() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_sample_application.rs b/tests/generated/preview2_udp_sample_application.rs
index 76004653e..4c1b2c959 100644
--- a/tests/generated/preview2_udp_sample_application.rs
+++ b/tests/generated/preview2_udp_sample_application.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_sample_application() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_sockopts.rs b/tests/generated/preview2_udp_sockopts.rs
index 20c0e7fb1..2a5aab662 100644
--- a/tests/generated/preview2_udp_sockopts.rs
+++ b/tests/generated/preview2_udp_sockopts.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_sockopts() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_states.rs b/tests/generated/preview2_udp_states.rs
index 855f82eca..9525988fb 100644
--- a/tests/generated/preview2_udp_states.rs
+++ b/tests/generated/preview2_udp_states.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_states() -> anyhow::Result<()> {
diff --git a/xtask/src/generate/tests.rs b/xtask/src/generate/tests.rs
index f86621120..790904ed5 100644
--- a/xtask/src/generate/tests.rs
+++ b/xtask/src/generate/tests.rs
@@ -69,8 +69,7 @@ fn generate_test(test_name: &str) -> String {
     };
     let skip = match test_name {
         // these tests currently stall
-        "api_read_only" |
-        "preview1_path_open_read_write" => true,
+        "api_read_only" | "preview1_path_open_read_write" => true,
         _ => false,
     };
     let skip_comment = if skip { "// " } else { "" };

From 6f4f1cfa9e4deecb6551fbd4cf9e1281cda7c89c Mon Sep 17 00:00:00 2001
From: Guy Bedford <gbedford@fastly.com>
Date: Tue, 21 Nov 2023 17:00:35 -0800
Subject: [PATCH 6/8] more cases

---
 .../preview2-shim/lib/nodejs/filesystem.js    | 20 +++++++++----------
 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_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    |  2 +-
 tests/generated/preview1_clock_time_get.rs    |  2 +-
 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  |  2 +-
 tests/generated/preview1_directory_seek.rs    |  2 +-
 tests/generated/preview1_fd_advise.rs         |  2 +-
 tests/generated/preview1_fd_filestat_get.rs   |  2 +-
 tests/generated/preview1_fd_filestat_set.rs   |  2 +-
 tests/generated/preview1_fd_flags_set.rs      |  2 +-
 tests/generated/preview1_fd_readdir.rs        |  2 +-
 tests/generated/preview1_file_allocate.rs     |  2 +-
 tests/generated/preview1_file_pread_pwrite.rs |  2 +-
 tests/generated/preview1_file_seek_tell.rs    |  2 +-
 tests/generated/preview1_file_truncation.rs   |  2 +-
 .../preview1_file_unbuffered_write.rs         |  2 +-
 tests/generated/preview1_file_write.rs        |  2 +-
 tests/generated/preview1_interesting_paths.rs |  2 +-
 tests/generated/preview1_nofollow_errors.rs   |  2 +-
 tests/generated/preview1_overwrite_preopen.rs |  2 +-
 tests/generated/preview1_path_exists.rs       |  2 +-
 tests/generated/preview1_path_filestat.rs     |  2 +-
 tests/generated/preview1_path_link.rs         |  2 +-
 .../preview1_path_open_create_existing.rs     |  2 +-
 .../preview1_path_open_dirfd_not_dir.rs       |  2 +-
 tests/generated/preview1_path_open_missing.rs |  2 +-
 .../generated/preview1_path_open_nonblock.rs  |  2 +-
 tests/generated/preview1_path_open_preopen.rs |  2 +-
 tests/generated/preview1_path_rename.rs       |  2 +-
 ...eview1_path_rename_dir_trailing_slashes.rs |  2 +-
 ...view1_path_rename_file_trailing_slashes.rs |  2 +-
 .../preview1_path_symlink_trailing_slashes.rs |  2 +-
 tests/generated/preview1_poll_oneoff_files.rs |  2 +-
 tests/generated/preview1_poll_oneoff_stdio.rs |  2 +-
 tests/generated/preview1_readlink.rs          |  2 +-
 .../generated/preview1_regular_file_isatty.rs |  2 +-
 tests/generated/preview1_remove_directory.rs  |  2 +-
 ...view1_remove_directory_trailing_slashes.rs |  2 +-
 .../preview1_remove_nonempty_directory.rs     |  2 +-
 tests/generated/preview1_renumber.rs          |  2 +-
 tests/generated/preview1_sched_yield.rs       |  2 +-
 tests/generated/preview1_stdio.rs             |  2 +-
 tests/generated/preview1_stdio_isatty.rs      |  2 +-
 tests/generated/preview1_stdio_not_isatty.rs  |  2 +-
 tests/generated/preview1_symlink_create.rs    |  2 +-
 tests/generated/preview1_symlink_filestat.rs  |  2 +-
 tests/generated/preview1_symlink_loop.rs      |  2 +-
 tests/generated/preview1_unicode_output.rs    |  2 +-
 .../preview1_unlink_file_trailing_slashes.rs  |  2 +-
 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                  |  3 ++-
 100 files changed, 110 insertions(+), 109 deletions(-)

diff --git a/packages/preview2-shim/lib/nodejs/filesystem.js b/packages/preview2-shim/lib/nodejs/filesystem.js
index 78097bc7d..375bfda5a 100644
--- a/packages/preview2-shim/lib/nodejs/filesystem.js
+++ b/packages/preview2-shim/lib/nodejs/filesystem.js
@@ -14,6 +14,7 @@ import {
   fsyncSync,
   ftruncateSync,
   futimesSync,
+  linkSync,
   lstatSync,
   lutimesSync,
   mkdirSync,
@@ -291,8 +292,14 @@ class Descriptor {
     }
   }
 
-  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) {
@@ -576,12 +583,5 @@ function convertFsError(e) {
 }
 
 function timestampToMs(timestamp) {
-  let zeros = "";
-  while (timestamp.nanoseconds < 10 ** (8 - zeros.length)) {
-    zeros += "0";
-  }
-  const out = `${Number(timestamp.seconds) * 1000}.${zeros}${
-    timestamp.nanoseconds
-  }`;
-  return out;
+  return Number(timestamp.seconds) * 1000 + timestamp.nanoseconds / 1e9;
 }
diff --git a/submodules/wasmtime b/submodules/wasmtime
index 859dc318d..d1ee4e478 160000
--- a/submodules/wasmtime
+++ b/submodules/wasmtime
@@ -1 +1 @@
-Subproject commit 859dc318de366223d61e251afa8b62bb920e4ff5
+Subproject commit d1ee4e47836a6528cb66b7a8de1746cda7612814
diff --git a/tests/generated/api_proxy.rs b/tests/generated/api_proxy.rs
index 8fa8f30c6..20a0fb839 100644
--- a/tests/generated/api_proxy.rs
+++ b/tests/generated/api_proxy.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn api_proxy() -> anyhow::Result<()> {
diff --git a/tests/generated/api_proxy_streaming.rs b/tests/generated/api_proxy_streaming.rs
index bac9b2cd6..c41fe91f2 100644
--- a/tests/generated/api_proxy_streaming.rs
+++ b/tests/generated/api_proxy_streaming.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn api_proxy_streaming() -> anyhow::Result<()> {
diff --git a/tests/generated/api_reactor.rs b/tests/generated/api_reactor.rs
index 9ee427b5a..868bf8274 100644
--- a/tests/generated/api_reactor.rs
+++ b/tests/generated/api_reactor.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn api_reactor() -> anyhow::Result<()> {
diff --git a/tests/generated/api_time.rs b/tests/generated/api_time.rs
index 7804809eb..34d397a3e 100644
--- a/tests/generated/api_time.rs
+++ b/tests/generated/api_time.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn api_time() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_args.rs b/tests/generated/cli_args.rs
index 7bf349567..b8d8d9d41 100644
--- a/tests/generated/cli_args.rs
+++ b/tests/generated/cli_args.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_args() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_default_clocks.rs b/tests/generated/cli_default_clocks.rs
index ccffefbe7..a627f7e71 100644
--- a/tests/generated/cli_default_clocks.rs
+++ b/tests/generated/cli_default_clocks.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_default_clocks() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_directory_list.rs b/tests/generated/cli_directory_list.rs
index 47d2bdca6..f45825978 100644
--- a/tests/generated/cli_directory_list.rs
+++ b/tests/generated/cli_directory_list.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_directory_list() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_env.rs b/tests/generated/cli_env.rs
index 83b33d0fd..b75cb5403 100644
--- a/tests/generated/cli_env.rs
+++ b/tests/generated/cli_env.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_env() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_default.rs b/tests/generated/cli_exit_default.rs
index 1a2620d7a..0014adf5e 100644
--- a/tests/generated/cli_exit_default.rs
+++ b/tests/generated/cli_exit_default.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_exit_default() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_failure.rs b/tests/generated/cli_exit_failure.rs
index 09d950ca1..3a0158b59 100644
--- a/tests/generated/cli_exit_failure.rs
+++ b/tests/generated/cli_exit_failure.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_exit_failure() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_panic.rs b/tests/generated/cli_exit_panic.rs
index 61acab4c2..db6504d94 100644
--- a/tests/generated/cli_exit_panic.rs
+++ b/tests/generated/cli_exit_panic.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_exit_panic() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_success.rs b/tests/generated/cli_exit_success.rs
index 42a74ae65..c24de88f1 100644
--- a/tests/generated/cli_exit_success.rs
+++ b/tests/generated/cli_exit_success.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_exit_success() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_export_cabi_realloc.rs b/tests/generated/cli_export_cabi_realloc.rs
index 5006a7384..25187bc3a 100644
--- a/tests/generated/cli_export_cabi_realloc.rs
+++ b/tests/generated/cli_export_cabi_realloc.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_export_cabi_realloc() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_append.rs b/tests/generated/cli_file_append.rs
index a59b5d0be..be2d2fee5 100644
--- a/tests/generated/cli_file_append.rs
+++ b/tests/generated/cli_file_append.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_file_append() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_dir_sync.rs b/tests/generated/cli_file_dir_sync.rs
index 0716394a2..6896e19eb 100644
--- a/tests/generated/cli_file_dir_sync.rs
+++ b/tests/generated/cli_file_dir_sync.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_file_dir_sync() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_read.rs b/tests/generated/cli_file_read.rs
index f2912e946..29569eb52 100644
--- a/tests/generated/cli_file_read.rs
+++ b/tests/generated/cli_file_read.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_file_read() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_hello_stdout.rs b/tests/generated/cli_hello_stdout.rs
index 3d3dc7634..ef1e0ebc9 100644
--- a/tests/generated/cli_hello_stdout.rs
+++ b/tests/generated/cli_hello_stdout.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_hello_stdout() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_splice_stdin.rs b/tests/generated/cli_splice_stdin.rs
index 3f19a6f42..d7aca7482 100644
--- a/tests/generated/cli_splice_stdin.rs
+++ b/tests/generated/cli_splice_stdin.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_splice_stdin() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_stdin.rs b/tests/generated/cli_stdin.rs
index e41c9d9c2..ce25dd2e2 100644
--- a/tests/generated/cli_stdin.rs
+++ b/tests/generated/cli_stdin.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_stdin() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_stdio_write_flushes.rs b/tests/generated/cli_stdio_write_flushes.rs
index dd10b6ebb..0dee52025 100644
--- a/tests/generated/cli_stdio_write_flushes.rs
+++ b/tests/generated/cli_stdio_write_flushes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn cli_stdio_write_flushes() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_content_length.rs b/tests/generated/http_outbound_request_content_length.rs
index 38c8e9ad0..d6c4c82c8 100644
--- a/tests/generated/http_outbound_request_content_length.rs
+++ b/tests/generated/http_outbound_request_content_length.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_content_length() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_get.rs b/tests/generated/http_outbound_request_get.rs
index 73d7438c5..45f6f6d50 100644
--- a/tests/generated/http_outbound_request_get.rs
+++ b/tests/generated/http_outbound_request_get.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_get() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_dnsname.rs b/tests/generated/http_outbound_request_invalid_dnsname.rs
index afb667fee..f56a0bd1c 100644
--- a/tests/generated/http_outbound_request_invalid_dnsname.rs
+++ b/tests/generated/http_outbound_request_invalid_dnsname.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_dnsname() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_header.rs b/tests/generated/http_outbound_request_invalid_header.rs
index 5f492534b..7c972dcf1 100644
--- a/tests/generated/http_outbound_request_invalid_header.rs
+++ b/tests/generated/http_outbound_request_invalid_header.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_header() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_port.rs b/tests/generated/http_outbound_request_invalid_port.rs
index 81c687d52..a0a08cacd 100644
--- a/tests/generated/http_outbound_request_invalid_port.rs
+++ b/tests/generated/http_outbound_request_invalid_port.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_port() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_version.rs b/tests/generated/http_outbound_request_invalid_version.rs
index ce2c9cdc9..381ef8d06 100644
--- a/tests/generated/http_outbound_request_invalid_version.rs
+++ b/tests/generated/http_outbound_request_invalid_version.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_version() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_large_post.rs b/tests/generated/http_outbound_request_large_post.rs
index e709ab87f..47d3d91d7 100644
--- a/tests/generated/http_outbound_request_large_post.rs
+++ b/tests/generated/http_outbound_request_large_post.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_large_post() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_post.rs b/tests/generated/http_outbound_request_post.rs
index fce263ea6..3be696bc3 100644
--- a/tests/generated/http_outbound_request_post.rs
+++ b/tests/generated/http_outbound_request_post.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_post() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_put.rs b/tests/generated/http_outbound_request_put.rs
index 5410fbd47..1cb9db583 100644
--- a/tests/generated/http_outbound_request_put.rs
+++ b/tests/generated/http_outbound_request_put.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_put() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_response_build.rs b/tests/generated/http_outbound_request_response_build.rs
index 6c945b4bb..c32113b9c 100644
--- a/tests/generated/http_outbound_request_response_build.rs
+++ b/tests/generated/http_outbound_request_response_build.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_response_build() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_unknown_method.rs b/tests/generated/http_outbound_request_unknown_method.rs
index 12be199c2..179be4f1f 100644
--- a/tests/generated/http_outbound_request_unknown_method.rs
+++ b/tests/generated/http_outbound_request_unknown_method.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_unknown_method() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_unsupported_scheme.rs b/tests/generated/http_outbound_request_unsupported_scheme.rs
index 9e136f6a2..91e9167bf 100644
--- a/tests/generated/http_outbound_request_unsupported_scheme.rs
+++ b/tests/generated/http_outbound_request_unsupported_scheme.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn http_outbound_request_unsupported_scheme() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_big_random_buf.rs b/tests/generated/preview1_big_random_buf.rs
index ceeeb94c4..e50e26768 100644
--- a/tests/generated/preview1_big_random_buf.rs
+++ b/tests/generated/preview1_big_random_buf.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_big_random_buf() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_clock_time_get.rs b/tests/generated/preview1_clock_time_get.rs
index 8e6050a1e..e6a48f765 100644
--- a/tests/generated/preview1_clock_time_get.rs
+++ b/tests/generated/preview1_clock_time_get.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_clock_time_get() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_close_preopen.rs b/tests/generated/preview1_close_preopen.rs
index 77a18188c..19a1c5748 100644
--- a/tests/generated/preview1_close_preopen.rs
+++ b/tests/generated/preview1_close_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_close_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dangling_fd.rs b/tests/generated/preview1_dangling_fd.rs
index 0d897cb94..cb65e3c2c 100644
--- a/tests/generated/preview1_dangling_fd.rs
+++ b/tests/generated/preview1_dangling_fd.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_dangling_fd() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dangling_symlink.rs b/tests/generated/preview1_dangling_symlink.rs
index 293d70900..548e9524d 100644
--- a/tests/generated/preview1_dangling_symlink.rs
+++ b/tests/generated/preview1_dangling_symlink.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_dangling_symlink() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dir_fd_op_failures.rs b/tests/generated/preview1_dir_fd_op_failures.rs
index d4d992854..535a60c72 100644
--- a/tests/generated/preview1_dir_fd_op_failures.rs
+++ b/tests/generated/preview1_dir_fd_op_failures.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_dir_fd_op_failures() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_directory_seek.rs b/tests/generated/preview1_directory_seek.rs
index f7f92b325..0c506ca25 100644
--- a/tests/generated/preview1_directory_seek.rs
+++ b/tests/generated/preview1_directory_seek.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_directory_seek() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_advise.rs b/tests/generated/preview1_fd_advise.rs
index a3a21e84e..6175c977c 100644
--- a/tests/generated/preview1_fd_advise.rs
+++ b/tests/generated/preview1_fd_advise.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_advise() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_filestat_get.rs b/tests/generated/preview1_fd_filestat_get.rs
index 36e6d3f52..488d4ff97 100644
--- a/tests/generated/preview1_fd_filestat_get.rs
+++ b/tests/generated/preview1_fd_filestat_get.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_filestat_get() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_filestat_set.rs b/tests/generated/preview1_fd_filestat_set.rs
index 38b30705d..051ec6b27 100644
--- a/tests/generated/preview1_fd_filestat_set.rs
+++ b/tests/generated/preview1_fd_filestat_set.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_filestat_set() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_flags_set.rs b/tests/generated/preview1_fd_flags_set.rs
index ec6198467..19afb2200 100644
--- a/tests/generated/preview1_fd_flags_set.rs
+++ b/tests/generated/preview1_fd_flags_set.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_flags_set() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_readdir.rs b/tests/generated/preview1_fd_readdir.rs
index e330dc326..59b2560ba 100644
--- a/tests/generated/preview1_fd_readdir.rs
+++ b/tests/generated/preview1_fd_readdir.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_fd_readdir() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_allocate.rs b/tests/generated/preview1_file_allocate.rs
index 2e66fb21f..0d706b9a8 100644
--- a/tests/generated/preview1_file_allocate.rs
+++ b/tests/generated/preview1_file_allocate.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_allocate() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_pread_pwrite.rs b/tests/generated/preview1_file_pread_pwrite.rs
index 0a223e8f0..691fc2480 100644
--- a/tests/generated/preview1_file_pread_pwrite.rs
+++ b/tests/generated/preview1_file_pread_pwrite.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_pread_pwrite() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_seek_tell.rs b/tests/generated/preview1_file_seek_tell.rs
index f63dcd42e..de76ea600 100644
--- a/tests/generated/preview1_file_seek_tell.rs
+++ b/tests/generated/preview1_file_seek_tell.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_seek_tell() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_truncation.rs b/tests/generated/preview1_file_truncation.rs
index 9644ff6be..27a6074f1 100644
--- a/tests/generated/preview1_file_truncation.rs
+++ b/tests/generated/preview1_file_truncation.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_truncation() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_unbuffered_write.rs b/tests/generated/preview1_file_unbuffered_write.rs
index 74550ef28..9b5b75d59 100644
--- a/tests/generated/preview1_file_unbuffered_write.rs
+++ b/tests/generated/preview1_file_unbuffered_write.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_unbuffered_write() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_write.rs b/tests/generated/preview1_file_write.rs
index 3bb115b53..fa46bcf60 100644
--- a/tests/generated/preview1_file_write.rs
+++ b/tests/generated/preview1_file_write.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_file_write() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_interesting_paths.rs b/tests/generated/preview1_interesting_paths.rs
index 51f267d7c..b512200c5 100644
--- a/tests/generated/preview1_interesting_paths.rs
+++ b/tests/generated/preview1_interesting_paths.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_interesting_paths() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_nofollow_errors.rs b/tests/generated/preview1_nofollow_errors.rs
index 2ee7530b6..29b3e8db5 100644
--- a/tests/generated/preview1_nofollow_errors.rs
+++ b/tests/generated/preview1_nofollow_errors.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_nofollow_errors() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_overwrite_preopen.rs b/tests/generated/preview1_overwrite_preopen.rs
index 8840e9d5f..3d60137b0 100644
--- a/tests/generated/preview1_overwrite_preopen.rs
+++ b/tests/generated/preview1_overwrite_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_overwrite_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_exists.rs b/tests/generated/preview1_path_exists.rs
index 61ae0f9f3..0bc55949b 100644
--- a/tests/generated/preview1_path_exists.rs
+++ b/tests/generated/preview1_path_exists.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_exists() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_filestat.rs b/tests/generated/preview1_path_filestat.rs
index 64f267101..4cb36aa17 100644
--- a/tests/generated/preview1_path_filestat.rs
+++ b/tests/generated/preview1_path_filestat.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_filestat() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_link.rs b/tests/generated/preview1_path_link.rs
index f236980ef..855a446ec 100644
--- a/tests/generated/preview1_path_link.rs
+++ b/tests/generated/preview1_path_link.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_link() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_create_existing.rs b/tests/generated/preview1_path_open_create_existing.rs
index 030c8f1fb..7caa30f3c 100644
--- a/tests/generated/preview1_path_open_create_existing.rs
+++ b/tests/generated/preview1_path_open_create_existing.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_create_existing() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_dirfd_not_dir.rs b/tests/generated/preview1_path_open_dirfd_not_dir.rs
index 1a493a151..24b246dbf 100644
--- a/tests/generated/preview1_path_open_dirfd_not_dir.rs
+++ b/tests/generated/preview1_path_open_dirfd_not_dir.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_dirfd_not_dir() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_missing.rs b/tests/generated/preview1_path_open_missing.rs
index 2a5e960b6..0e556eaf2 100644
--- a/tests/generated/preview1_path_open_missing.rs
+++ b/tests/generated/preview1_path_open_missing.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_missing() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_nonblock.rs b/tests/generated/preview1_path_open_nonblock.rs
index a4008f6ef..bfde91e8a 100644
--- a/tests/generated/preview1_path_open_nonblock.rs
+++ b/tests/generated/preview1_path_open_nonblock.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_nonblock() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_preopen.rs b/tests/generated/preview1_path_open_preopen.rs
index c8a173a1a..82a14771d 100644
--- a/tests/generated/preview1_path_open_preopen.rs
+++ b/tests/generated/preview1_path_open_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_open_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename.rs b/tests/generated/preview1_path_rename.rs
index 6f3d8f1aa..c08087bff 100644
--- a/tests/generated/preview1_path_rename.rs
+++ b/tests/generated/preview1_path_rename.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_rename() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
index 30f442217..af6228101 100644
--- a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_rename_dir_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename_file_trailing_slashes.rs b/tests/generated/preview1_path_rename_file_trailing_slashes.rs
index edac16b82..471b3b728 100644
--- a/tests/generated/preview1_path_rename_file_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_file_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_rename_file_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_symlink_trailing_slashes.rs b/tests/generated/preview1_path_symlink_trailing_slashes.rs
index 6e8324a87..93d02f2d3 100644
--- a/tests/generated/preview1_path_symlink_trailing_slashes.rs
+++ b/tests/generated/preview1_path_symlink_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_path_symlink_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_poll_oneoff_files.rs b/tests/generated/preview1_poll_oneoff_files.rs
index c65fa4152..a2440a865 100644
--- a/tests/generated/preview1_poll_oneoff_files.rs
+++ b/tests/generated/preview1_poll_oneoff_files.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_poll_oneoff_files() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_poll_oneoff_stdio.rs b/tests/generated/preview1_poll_oneoff_stdio.rs
index 0e0dac8f6..dbeb2631a 100644
--- a/tests/generated/preview1_poll_oneoff_stdio.rs
+++ b/tests/generated/preview1_poll_oneoff_stdio.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_poll_oneoff_stdio() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_readlink.rs b/tests/generated/preview1_readlink.rs
index b780dc908..33bc38640 100644
--- a/tests/generated/preview1_readlink.rs
+++ b/tests/generated/preview1_readlink.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_readlink() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_regular_file_isatty.rs b/tests/generated/preview1_regular_file_isatty.rs
index d1788fbdf..ffe42b6e3 100644
--- a/tests/generated/preview1_regular_file_isatty.rs
+++ b/tests/generated/preview1_regular_file_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_regular_file_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_directory.rs b/tests/generated/preview1_remove_directory.rs
index 138c472ff..40d3ee5f7 100644
--- a/tests/generated/preview1_remove_directory.rs
+++ b/tests/generated/preview1_remove_directory.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_remove_directory() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_directory_trailing_slashes.rs b/tests/generated/preview1_remove_directory_trailing_slashes.rs
index 26a077270..85941bbd7 100644
--- a/tests/generated/preview1_remove_directory_trailing_slashes.rs
+++ b/tests/generated/preview1_remove_directory_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_remove_directory_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_nonempty_directory.rs b/tests/generated/preview1_remove_nonempty_directory.rs
index 4668cdb86..a02a504dd 100644
--- a/tests/generated/preview1_remove_nonempty_directory.rs
+++ b/tests/generated/preview1_remove_nonempty_directory.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_remove_nonempty_directory() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_renumber.rs b/tests/generated/preview1_renumber.rs
index dea34672e..829b4f038 100644
--- a/tests/generated/preview1_renumber.rs
+++ b/tests/generated/preview1_renumber.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_renumber() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_sched_yield.rs b/tests/generated/preview1_sched_yield.rs
index e3def63d1..441f39343 100644
--- a/tests/generated/preview1_sched_yield.rs
+++ b/tests/generated/preview1_sched_yield.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_sched_yield() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio.rs b/tests/generated/preview1_stdio.rs
index 5f8f1f49b..2a347efdb 100644
--- a/tests/generated/preview1_stdio.rs
+++ b/tests/generated/preview1_stdio.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_stdio() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio_isatty.rs b/tests/generated/preview1_stdio_isatty.rs
index 41b75e2e6..c3c320ea7 100644
--- a/tests/generated/preview1_stdio_isatty.rs
+++ b/tests/generated/preview1_stdio_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_stdio_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio_not_isatty.rs b/tests/generated/preview1_stdio_not_isatty.rs
index 498004857..7e77f9ff9 100644
--- a/tests/generated/preview1_stdio_not_isatty.rs
+++ b/tests/generated/preview1_stdio_not_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_stdio_not_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_create.rs b/tests/generated/preview1_symlink_create.rs
index cb8609790..aa694d8ec 100644
--- a/tests/generated/preview1_symlink_create.rs
+++ b/tests/generated/preview1_symlink_create.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_symlink_create() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_filestat.rs b/tests/generated/preview1_symlink_filestat.rs
index 538532d71..be884c133 100644
--- a/tests/generated/preview1_symlink_filestat.rs
+++ b/tests/generated/preview1_symlink_filestat.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_symlink_filestat() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_loop.rs b/tests/generated/preview1_symlink_loop.rs
index 6d133f125..447708d79 100644
--- a/tests/generated/preview1_symlink_loop.rs
+++ b/tests/generated/preview1_symlink_loop.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_symlink_loop() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_unicode_output.rs b/tests/generated/preview1_unicode_output.rs
index 39680cadc..c3b60eb8b 100644
--- a/tests/generated/preview1_unicode_output.rs
+++ b/tests/generated/preview1_unicode_output.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_unicode_output() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_unlink_file_trailing_slashes.rs b/tests/generated/preview1_unlink_file_trailing_slashes.rs
index 14d8ccd29..3797f1d76 100644
--- a/tests/generated/preview1_unlink_file_trailing_slashes.rs
+++ b/tests/generated/preview1_unlink_file_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview1_unlink_file_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_ip_name_lookup.rs b/tests/generated/preview2_ip_name_lookup.rs
index e7450ccdb..832a9fe80 100644
--- a/tests/generated/preview2_ip_name_lookup.rs
+++ b/tests/generated/preview2_ip_name_lookup.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_ip_name_lookup() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_random.rs b/tests/generated/preview2_random.rs
index ff4f75543..148b433ac 100644
--- a/tests/generated/preview2_random.rs
+++ b/tests/generated/preview2_random.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_random() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_sleep.rs b/tests/generated/preview2_sleep.rs
index c8a7e2fdd..9431c7dcb 100644
--- a/tests/generated/preview2_sleep.rs
+++ b/tests/generated/preview2_sleep.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_sleep() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_stream_pollable_correct.rs b/tests/generated/preview2_stream_pollable_correct.rs
index 932170850..071e94911 100644
--- a/tests/generated/preview2_stream_pollable_correct.rs
+++ b/tests/generated/preview2_stream_pollable_correct.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_stream_pollable_correct() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_stream_pollable_traps.rs b/tests/generated/preview2_stream_pollable_traps.rs
index d9b68927f..7c1f6289f 100644
--- a/tests/generated/preview2_stream_pollable_traps.rs
+++ b/tests/generated/preview2_stream_pollable_traps.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_stream_pollable_traps() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_bind.rs b/tests/generated/preview2_tcp_bind.rs
index 55ac5ee1d..503a86f89 100644
--- a/tests/generated/preview2_tcp_bind.rs
+++ b/tests/generated/preview2_tcp_bind.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_bind() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_connect.rs b/tests/generated/preview2_tcp_connect.rs
index acba5b19d..c4b2ddab7 100644
--- a/tests/generated/preview2_tcp_connect.rs
+++ b/tests/generated/preview2_tcp_connect.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_connect() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_sample_application.rs b/tests/generated/preview2_tcp_sample_application.rs
index 9cf3a8406..da19eb861 100644
--- a/tests/generated/preview2_tcp_sample_application.rs
+++ b/tests/generated/preview2_tcp_sample_application.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_sample_application() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_sockopts.rs b/tests/generated/preview2_tcp_sockopts.rs
index 4dbadfa5f..f661da6d2 100644
--- a/tests/generated/preview2_tcp_sockopts.rs
+++ b/tests/generated/preview2_tcp_sockopts.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_sockopts() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_states.rs b/tests/generated/preview2_tcp_states.rs
index e1b9786a8..08b4e900f 100644
--- a/tests/generated/preview2_tcp_states.rs
+++ b/tests/generated/preview2_tcp_states.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_tcp_states() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_bind.rs b/tests/generated/preview2_udp_bind.rs
index 9c55bf139..5bb29a27a 100644
--- a/tests/generated/preview2_udp_bind.rs
+++ b/tests/generated/preview2_udp_bind.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_bind() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_connect.rs b/tests/generated/preview2_udp_connect.rs
index 7a58a5e7d..bfd72a69f 100644
--- a/tests/generated/preview2_udp_connect.rs
+++ b/tests/generated/preview2_udp_connect.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_connect() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_sample_application.rs b/tests/generated/preview2_udp_sample_application.rs
index 4c1b2c959..76004653e 100644
--- a/tests/generated/preview2_udp_sample_application.rs
+++ b/tests/generated/preview2_udp_sample_application.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_sample_application() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_sockopts.rs b/tests/generated/preview2_udp_sockopts.rs
index 2a5aab662..20c0e7fb1 100644
--- a/tests/generated/preview2_udp_sockopts.rs
+++ b/tests/generated/preview2_udp_sockopts.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_sockopts() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_states.rs b/tests/generated/preview2_udp_states.rs
index 9525988fb..855f82eca 100644
--- a/tests/generated/preview2_udp_states.rs
+++ b/tests/generated/preview2_udp_states.rs
@@ -1,9 +1,9 @@
 //! 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};
+use std::fs;
 
 #[test]
 fn preview2_udp_states() -> anyhow::Result<()> {
diff --git a/tests/virtualenvs/scratch.js b/tests/virtualenvs/scratch.js
index e55912d30..b9fe0f621 100644
--- a/tests/virtualenvs/scratch.js
+++ b/tests/virtualenvs/scratch.js
@@ -5,7 +5,8 @@ import { rmdirSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 
 _setEnv({
-  NO_ACCURATE_TIME: "1"
+  NO_ACCURATE_TIME: "1",
+  NO_DANGLING_FILESYSTEM: "1"
 });
 
 _setArgs(['_', '/']);

From 2443003546fe53070c9bf762a1c819e02f648872 Mon Sep 17 00:00:00 2001
From: Guy Bedford <gbedford@fastly.com>
Date: Tue, 21 Nov 2023 17:02:28 -0800
Subject: [PATCH 7/8] fmt

---
 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                              | 2 +-
 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 +-
 tests/generated/http_outbound_request_content_length.rs       | 2 +-
 tests/generated/http_outbound_request_get.rs                  | 2 +-
 tests/generated/http_outbound_request_invalid_dnsname.rs      | 2 +-
 tests/generated/http_outbound_request_invalid_header.rs       | 2 +-
 tests/generated/http_outbound_request_invalid_port.rs         | 2 +-
 tests/generated/http_outbound_request_invalid_version.rs      | 2 +-
 tests/generated/http_outbound_request_large_post.rs           | 2 +-
 tests/generated/http_outbound_request_post.rs                 | 2 +-
 tests/generated/http_outbound_request_put.rs                  | 2 +-
 tests/generated/http_outbound_request_response_build.rs       | 2 +-
 tests/generated/http_outbound_request_unknown_method.rs       | 2 +-
 tests/generated/http_outbound_request_unsupported_scheme.rs   | 2 +-
 tests/generated/preview1_big_random_buf.rs                    | 2 +-
 tests/generated/preview1_clock_time_get.rs                    | 2 +-
 tests/generated/preview1_close_preopen.rs                     | 2 +-
 tests/generated/preview1_dangling_fd.rs                       | 2 +-
 tests/generated/preview1_dangling_symlink.rs                  | 2 +-
 tests/generated/preview1_dir_fd_op_failures.rs                | 2 +-
 tests/generated/preview1_directory_seek.rs                    | 2 +-
 tests/generated/preview1_fd_advise.rs                         | 2 +-
 tests/generated/preview1_fd_filestat_get.rs                   | 2 +-
 tests/generated/preview1_fd_filestat_set.rs                   | 2 +-
 tests/generated/preview1_fd_flags_set.rs                      | 2 +-
 tests/generated/preview1_fd_readdir.rs                        | 2 +-
 tests/generated/preview1_file_allocate.rs                     | 2 +-
 tests/generated/preview1_file_pread_pwrite.rs                 | 2 +-
 tests/generated/preview1_file_seek_tell.rs                    | 2 +-
 tests/generated/preview1_file_truncation.rs                   | 2 +-
 tests/generated/preview1_file_unbuffered_write.rs             | 2 +-
 tests/generated/preview1_file_write.rs                        | 2 +-
 tests/generated/preview1_interesting_paths.rs                 | 2 +-
 tests/generated/preview1_nofollow_errors.rs                   | 2 +-
 tests/generated/preview1_overwrite_preopen.rs                 | 2 +-
 tests/generated/preview1_path_exists.rs                       | 2 +-
 tests/generated/preview1_path_filestat.rs                     | 2 +-
 tests/generated/preview1_path_link.rs                         | 2 +-
 tests/generated/preview1_path_open_create_existing.rs         | 2 +-
 tests/generated/preview1_path_open_dirfd_not_dir.rs           | 2 +-
 tests/generated/preview1_path_open_missing.rs                 | 2 +-
 tests/generated/preview1_path_open_nonblock.rs                | 2 +-
 tests/generated/preview1_path_open_preopen.rs                 | 2 +-
 tests/generated/preview1_path_open_read_write.rs              | 2 +-
 tests/generated/preview1_path_rename.rs                       | 2 +-
 tests/generated/preview1_path_rename_dir_trailing_slashes.rs  | 2 +-
 tests/generated/preview1_path_rename_file_trailing_slashes.rs | 2 +-
 tests/generated/preview1_path_symlink_trailing_slashes.rs     | 2 +-
 tests/generated/preview1_poll_oneoff_files.rs                 | 2 +-
 tests/generated/preview1_poll_oneoff_stdio.rs                 | 2 +-
 tests/generated/preview1_readlink.rs                          | 2 +-
 tests/generated/preview1_regular_file_isatty.rs               | 2 +-
 tests/generated/preview1_remove_directory.rs                  | 2 +-
 tests/generated/preview1_remove_directory_trailing_slashes.rs | 2 +-
 tests/generated/preview1_remove_nonempty_directory.rs         | 2 +-
 tests/generated/preview1_renumber.rs                          | 2 +-
 tests/generated/preview1_sched_yield.rs                       | 2 +-
 tests/generated/preview1_stdio.rs                             | 2 +-
 tests/generated/preview1_stdio_isatty.rs                      | 2 +-
 tests/generated/preview1_stdio_not_isatty.rs                  | 2 +-
 tests/generated/preview1_symlink_create.rs                    | 2 +-
 tests/generated/preview1_symlink_filestat.rs                  | 2 +-
 tests/generated/preview1_symlink_loop.rs                      | 2 +-
 tests/generated/preview1_unicode_output.rs                    | 2 +-
 tests/generated/preview1_unlink_file_trailing_slashes.rs      | 2 +-
 tests/generated/preview2_ip_name_lookup.rs                    | 2 +-
 tests/generated/preview2_random.rs                            | 2 +-
 tests/generated/preview2_sleep.rs                             | 2 +-
 tests/generated/preview2_stream_pollable_correct.rs           | 2 +-
 tests/generated/preview2_stream_pollable_traps.rs             | 2 +-
 tests/generated/preview2_tcp_bind.rs                          | 2 +-
 tests/generated/preview2_tcp_connect.rs                       | 2 +-
 tests/generated/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 +-
 tests/generated/preview2_udp_sample_application.rs            | 2 +-
 tests/generated/preview2_udp_sockopts.rs                      | 2 +-
 tests/generated/preview2_udp_states.rs                        | 2 +-
 xtask/src/generate/tests.rs                                   | 2 +-
 100 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/tests/generated/api_proxy.rs b/tests/generated/api_proxy.rs
index 20a0fb839..8fa8f30c6 100644
--- a/tests/generated/api_proxy.rs
+++ b/tests/generated/api_proxy.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn api_proxy() -> anyhow::Result<()> {
diff --git a/tests/generated/api_proxy_streaming.rs b/tests/generated/api_proxy_streaming.rs
index c41fe91f2..bac9b2cd6 100644
--- a/tests/generated/api_proxy_streaming.rs
+++ b/tests/generated/api_proxy_streaming.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn api_proxy_streaming() -> anyhow::Result<()> {
diff --git a/tests/generated/api_reactor.rs b/tests/generated/api_reactor.rs
index 868bf8274..9ee427b5a 100644
--- a/tests/generated/api_reactor.rs
+++ b/tests/generated/api_reactor.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn api_reactor() -> anyhow::Result<()> {
diff --git a/tests/generated/api_read_only.rs b/tests/generated/api_read_only.rs
index 76509fdb3..83c6b6ed9 100644
--- a/tests/generated/api_read_only.rs
+++ b/tests/generated/api_read_only.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn api_read_only() -> anyhow::Result<()> {
diff --git a/tests/generated/api_time.rs b/tests/generated/api_time.rs
index 34d397a3e..7804809eb 100644
--- a/tests/generated/api_time.rs
+++ b/tests/generated/api_time.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn api_time() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_args.rs b/tests/generated/cli_args.rs
index b8d8d9d41..7bf349567 100644
--- a/tests/generated/cli_args.rs
+++ b/tests/generated/cli_args.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_args() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_default_clocks.rs b/tests/generated/cli_default_clocks.rs
index a627f7e71..ccffefbe7 100644
--- a/tests/generated/cli_default_clocks.rs
+++ b/tests/generated/cli_default_clocks.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_default_clocks() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_directory_list.rs b/tests/generated/cli_directory_list.rs
index f45825978..47d2bdca6 100644
--- a/tests/generated/cli_directory_list.rs
+++ b/tests/generated/cli_directory_list.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_directory_list() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_env.rs b/tests/generated/cli_env.rs
index b75cb5403..83b33d0fd 100644
--- a/tests/generated/cli_env.rs
+++ b/tests/generated/cli_env.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_env() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_default.rs b/tests/generated/cli_exit_default.rs
index 0014adf5e..1a2620d7a 100644
--- a/tests/generated/cli_exit_default.rs
+++ b/tests/generated/cli_exit_default.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_exit_default() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_failure.rs b/tests/generated/cli_exit_failure.rs
index 3a0158b59..09d950ca1 100644
--- a/tests/generated/cli_exit_failure.rs
+++ b/tests/generated/cli_exit_failure.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_exit_failure() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_panic.rs b/tests/generated/cli_exit_panic.rs
index db6504d94..61acab4c2 100644
--- a/tests/generated/cli_exit_panic.rs
+++ b/tests/generated/cli_exit_panic.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_exit_panic() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_exit_success.rs b/tests/generated/cli_exit_success.rs
index c24de88f1..42a74ae65 100644
--- a/tests/generated/cli_exit_success.rs
+++ b/tests/generated/cli_exit_success.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_exit_success() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_export_cabi_realloc.rs b/tests/generated/cli_export_cabi_realloc.rs
index 25187bc3a..5006a7384 100644
--- a/tests/generated/cli_export_cabi_realloc.rs
+++ b/tests/generated/cli_export_cabi_realloc.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_export_cabi_realloc() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_append.rs b/tests/generated/cli_file_append.rs
index be2d2fee5..a59b5d0be 100644
--- a/tests/generated/cli_file_append.rs
+++ b/tests/generated/cli_file_append.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_file_append() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_dir_sync.rs b/tests/generated/cli_file_dir_sync.rs
index 6896e19eb..0716394a2 100644
--- a/tests/generated/cli_file_dir_sync.rs
+++ b/tests/generated/cli_file_dir_sync.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_file_dir_sync() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_file_read.rs b/tests/generated/cli_file_read.rs
index 29569eb52..f2912e946 100644
--- a/tests/generated/cli_file_read.rs
+++ b/tests/generated/cli_file_read.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_file_read() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_hello_stdout.rs b/tests/generated/cli_hello_stdout.rs
index ef1e0ebc9..3d3dc7634 100644
--- a/tests/generated/cli_hello_stdout.rs
+++ b/tests/generated/cli_hello_stdout.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_hello_stdout() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_splice_stdin.rs b/tests/generated/cli_splice_stdin.rs
index d7aca7482..3f19a6f42 100644
--- a/tests/generated/cli_splice_stdin.rs
+++ b/tests/generated/cli_splice_stdin.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_splice_stdin() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_stdin.rs b/tests/generated/cli_stdin.rs
index ce25dd2e2..e41c9d9c2 100644
--- a/tests/generated/cli_stdin.rs
+++ b/tests/generated/cli_stdin.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_stdin() -> anyhow::Result<()> {
diff --git a/tests/generated/cli_stdio_write_flushes.rs b/tests/generated/cli_stdio_write_flushes.rs
index 0dee52025..dd10b6ebb 100644
--- a/tests/generated/cli_stdio_write_flushes.rs
+++ b/tests/generated/cli_stdio_write_flushes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn cli_stdio_write_flushes() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_content_length.rs b/tests/generated/http_outbound_request_content_length.rs
index d6c4c82c8..38c8e9ad0 100644
--- a/tests/generated/http_outbound_request_content_length.rs
+++ b/tests/generated/http_outbound_request_content_length.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_content_length() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_get.rs b/tests/generated/http_outbound_request_get.rs
index 45f6f6d50..73d7438c5 100644
--- a/tests/generated/http_outbound_request_get.rs
+++ b/tests/generated/http_outbound_request_get.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_get() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_dnsname.rs b/tests/generated/http_outbound_request_invalid_dnsname.rs
index f56a0bd1c..afb667fee 100644
--- a/tests/generated/http_outbound_request_invalid_dnsname.rs
+++ b/tests/generated/http_outbound_request_invalid_dnsname.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_dnsname() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_header.rs b/tests/generated/http_outbound_request_invalid_header.rs
index 7c972dcf1..5f492534b 100644
--- a/tests/generated/http_outbound_request_invalid_header.rs
+++ b/tests/generated/http_outbound_request_invalid_header.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_header() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_port.rs b/tests/generated/http_outbound_request_invalid_port.rs
index a0a08cacd..81c687d52 100644
--- a/tests/generated/http_outbound_request_invalid_port.rs
+++ b/tests/generated/http_outbound_request_invalid_port.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_port() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_invalid_version.rs b/tests/generated/http_outbound_request_invalid_version.rs
index 381ef8d06..ce2c9cdc9 100644
--- a/tests/generated/http_outbound_request_invalid_version.rs
+++ b/tests/generated/http_outbound_request_invalid_version.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_invalid_version() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_large_post.rs b/tests/generated/http_outbound_request_large_post.rs
index 47d3d91d7..e709ab87f 100644
--- a/tests/generated/http_outbound_request_large_post.rs
+++ b/tests/generated/http_outbound_request_large_post.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_large_post() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_post.rs b/tests/generated/http_outbound_request_post.rs
index 3be696bc3..fce263ea6 100644
--- a/tests/generated/http_outbound_request_post.rs
+++ b/tests/generated/http_outbound_request_post.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_post() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_put.rs b/tests/generated/http_outbound_request_put.rs
index 1cb9db583..5410fbd47 100644
--- a/tests/generated/http_outbound_request_put.rs
+++ b/tests/generated/http_outbound_request_put.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_put() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_response_build.rs b/tests/generated/http_outbound_request_response_build.rs
index c32113b9c..6c945b4bb 100644
--- a/tests/generated/http_outbound_request_response_build.rs
+++ b/tests/generated/http_outbound_request_response_build.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_response_build() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_unknown_method.rs b/tests/generated/http_outbound_request_unknown_method.rs
index 179be4f1f..12be199c2 100644
--- a/tests/generated/http_outbound_request_unknown_method.rs
+++ b/tests/generated/http_outbound_request_unknown_method.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_unknown_method() -> anyhow::Result<()> {
diff --git a/tests/generated/http_outbound_request_unsupported_scheme.rs b/tests/generated/http_outbound_request_unsupported_scheme.rs
index 91e9167bf..9e136f6a2 100644
--- a/tests/generated/http_outbound_request_unsupported_scheme.rs
+++ b/tests/generated/http_outbound_request_unsupported_scheme.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn http_outbound_request_unsupported_scheme() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_big_random_buf.rs b/tests/generated/preview1_big_random_buf.rs
index e50e26768..ceeeb94c4 100644
--- a/tests/generated/preview1_big_random_buf.rs
+++ b/tests/generated/preview1_big_random_buf.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_big_random_buf() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_clock_time_get.rs b/tests/generated/preview1_clock_time_get.rs
index e6a48f765..8e6050a1e 100644
--- a/tests/generated/preview1_clock_time_get.rs
+++ b/tests/generated/preview1_clock_time_get.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_clock_time_get() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_close_preopen.rs b/tests/generated/preview1_close_preopen.rs
index 19a1c5748..77a18188c 100644
--- a/tests/generated/preview1_close_preopen.rs
+++ b/tests/generated/preview1_close_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_close_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dangling_fd.rs b/tests/generated/preview1_dangling_fd.rs
index cb65e3c2c..0d897cb94 100644
--- a/tests/generated/preview1_dangling_fd.rs
+++ b/tests/generated/preview1_dangling_fd.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_dangling_fd() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dangling_symlink.rs b/tests/generated/preview1_dangling_symlink.rs
index 548e9524d..293d70900 100644
--- a/tests/generated/preview1_dangling_symlink.rs
+++ b/tests/generated/preview1_dangling_symlink.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_dangling_symlink() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_dir_fd_op_failures.rs b/tests/generated/preview1_dir_fd_op_failures.rs
index 535a60c72..d4d992854 100644
--- a/tests/generated/preview1_dir_fd_op_failures.rs
+++ b/tests/generated/preview1_dir_fd_op_failures.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_dir_fd_op_failures() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_directory_seek.rs b/tests/generated/preview1_directory_seek.rs
index 0c506ca25..f7f92b325 100644
--- a/tests/generated/preview1_directory_seek.rs
+++ b/tests/generated/preview1_directory_seek.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_directory_seek() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_advise.rs b/tests/generated/preview1_fd_advise.rs
index 6175c977c..a3a21e84e 100644
--- a/tests/generated/preview1_fd_advise.rs
+++ b/tests/generated/preview1_fd_advise.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_advise() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_filestat_get.rs b/tests/generated/preview1_fd_filestat_get.rs
index 488d4ff97..36e6d3f52 100644
--- a/tests/generated/preview1_fd_filestat_get.rs
+++ b/tests/generated/preview1_fd_filestat_get.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_filestat_get() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_filestat_set.rs b/tests/generated/preview1_fd_filestat_set.rs
index 051ec6b27..38b30705d 100644
--- a/tests/generated/preview1_fd_filestat_set.rs
+++ b/tests/generated/preview1_fd_filestat_set.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_filestat_set() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_flags_set.rs b/tests/generated/preview1_fd_flags_set.rs
index 19afb2200..ec6198467 100644
--- a/tests/generated/preview1_fd_flags_set.rs
+++ b/tests/generated/preview1_fd_flags_set.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_flags_set() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_fd_readdir.rs b/tests/generated/preview1_fd_readdir.rs
index 59b2560ba..e330dc326 100644
--- a/tests/generated/preview1_fd_readdir.rs
+++ b/tests/generated/preview1_fd_readdir.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_fd_readdir() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_allocate.rs b/tests/generated/preview1_file_allocate.rs
index 0d706b9a8..2e66fb21f 100644
--- a/tests/generated/preview1_file_allocate.rs
+++ b/tests/generated/preview1_file_allocate.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_allocate() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_pread_pwrite.rs b/tests/generated/preview1_file_pread_pwrite.rs
index 691fc2480..0a223e8f0 100644
--- a/tests/generated/preview1_file_pread_pwrite.rs
+++ b/tests/generated/preview1_file_pread_pwrite.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_pread_pwrite() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_seek_tell.rs b/tests/generated/preview1_file_seek_tell.rs
index de76ea600..f63dcd42e 100644
--- a/tests/generated/preview1_file_seek_tell.rs
+++ b/tests/generated/preview1_file_seek_tell.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_seek_tell() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_truncation.rs b/tests/generated/preview1_file_truncation.rs
index 27a6074f1..9644ff6be 100644
--- a/tests/generated/preview1_file_truncation.rs
+++ b/tests/generated/preview1_file_truncation.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_truncation() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_unbuffered_write.rs b/tests/generated/preview1_file_unbuffered_write.rs
index 9b5b75d59..74550ef28 100644
--- a/tests/generated/preview1_file_unbuffered_write.rs
+++ b/tests/generated/preview1_file_unbuffered_write.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_unbuffered_write() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_file_write.rs b/tests/generated/preview1_file_write.rs
index fa46bcf60..3bb115b53 100644
--- a/tests/generated/preview1_file_write.rs
+++ b/tests/generated/preview1_file_write.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_file_write() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_interesting_paths.rs b/tests/generated/preview1_interesting_paths.rs
index b512200c5..51f267d7c 100644
--- a/tests/generated/preview1_interesting_paths.rs
+++ b/tests/generated/preview1_interesting_paths.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_interesting_paths() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_nofollow_errors.rs b/tests/generated/preview1_nofollow_errors.rs
index 29b3e8db5..2ee7530b6 100644
--- a/tests/generated/preview1_nofollow_errors.rs
+++ b/tests/generated/preview1_nofollow_errors.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_nofollow_errors() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_overwrite_preopen.rs b/tests/generated/preview1_overwrite_preopen.rs
index 3d60137b0..8840e9d5f 100644
--- a/tests/generated/preview1_overwrite_preopen.rs
+++ b/tests/generated/preview1_overwrite_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_overwrite_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_exists.rs b/tests/generated/preview1_path_exists.rs
index 0bc55949b..61ae0f9f3 100644
--- a/tests/generated/preview1_path_exists.rs
+++ b/tests/generated/preview1_path_exists.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_exists() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_filestat.rs b/tests/generated/preview1_path_filestat.rs
index 4cb36aa17..64f267101 100644
--- a/tests/generated/preview1_path_filestat.rs
+++ b/tests/generated/preview1_path_filestat.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_filestat() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_link.rs b/tests/generated/preview1_path_link.rs
index 855a446ec..f236980ef 100644
--- a/tests/generated/preview1_path_link.rs
+++ b/tests/generated/preview1_path_link.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_link() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_create_existing.rs b/tests/generated/preview1_path_open_create_existing.rs
index 7caa30f3c..030c8f1fb 100644
--- a/tests/generated/preview1_path_open_create_existing.rs
+++ b/tests/generated/preview1_path_open_create_existing.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_create_existing() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_dirfd_not_dir.rs b/tests/generated/preview1_path_open_dirfd_not_dir.rs
index 24b246dbf..1a493a151 100644
--- a/tests/generated/preview1_path_open_dirfd_not_dir.rs
+++ b/tests/generated/preview1_path_open_dirfd_not_dir.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_dirfd_not_dir() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_missing.rs b/tests/generated/preview1_path_open_missing.rs
index 0e556eaf2..2a5e960b6 100644
--- a/tests/generated/preview1_path_open_missing.rs
+++ b/tests/generated/preview1_path_open_missing.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_missing() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_nonblock.rs b/tests/generated/preview1_path_open_nonblock.rs
index bfde91e8a..a4008f6ef 100644
--- a/tests/generated/preview1_path_open_nonblock.rs
+++ b/tests/generated/preview1_path_open_nonblock.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_nonblock() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_preopen.rs b/tests/generated/preview1_path_open_preopen.rs
index 82a14771d..c8a173a1a 100644
--- a/tests/generated/preview1_path_open_preopen.rs
+++ b/tests/generated/preview1_path_open_preopen.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_preopen() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_open_read_write.rs b/tests/generated/preview1_path_open_read_write.rs
index 00d0f36cd..e4daa613c 100644
--- a/tests/generated/preview1_path_open_read_write.rs
+++ b/tests/generated/preview1_path_open_read_write.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_open_read_write() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename.rs b/tests/generated/preview1_path_rename.rs
index c08087bff..6f3d8f1aa 100644
--- a/tests/generated/preview1_path_rename.rs
+++ b/tests/generated/preview1_path_rename.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_rename() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
index af6228101..30f442217 100644
--- a/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_dir_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_rename_dir_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_rename_file_trailing_slashes.rs b/tests/generated/preview1_path_rename_file_trailing_slashes.rs
index 471b3b728..edac16b82 100644
--- a/tests/generated/preview1_path_rename_file_trailing_slashes.rs
+++ b/tests/generated/preview1_path_rename_file_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_rename_file_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_path_symlink_trailing_slashes.rs b/tests/generated/preview1_path_symlink_trailing_slashes.rs
index 93d02f2d3..6e8324a87 100644
--- a/tests/generated/preview1_path_symlink_trailing_slashes.rs
+++ b/tests/generated/preview1_path_symlink_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_path_symlink_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_poll_oneoff_files.rs b/tests/generated/preview1_poll_oneoff_files.rs
index a2440a865..c65fa4152 100644
--- a/tests/generated/preview1_poll_oneoff_files.rs
+++ b/tests/generated/preview1_poll_oneoff_files.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_poll_oneoff_files() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_poll_oneoff_stdio.rs b/tests/generated/preview1_poll_oneoff_stdio.rs
index dbeb2631a..0e0dac8f6 100644
--- a/tests/generated/preview1_poll_oneoff_stdio.rs
+++ b/tests/generated/preview1_poll_oneoff_stdio.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_poll_oneoff_stdio() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_readlink.rs b/tests/generated/preview1_readlink.rs
index 33bc38640..b780dc908 100644
--- a/tests/generated/preview1_readlink.rs
+++ b/tests/generated/preview1_readlink.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_readlink() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_regular_file_isatty.rs b/tests/generated/preview1_regular_file_isatty.rs
index ffe42b6e3..d1788fbdf 100644
--- a/tests/generated/preview1_regular_file_isatty.rs
+++ b/tests/generated/preview1_regular_file_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_regular_file_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_directory.rs b/tests/generated/preview1_remove_directory.rs
index 40d3ee5f7..138c472ff 100644
--- a/tests/generated/preview1_remove_directory.rs
+++ b/tests/generated/preview1_remove_directory.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_remove_directory() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_directory_trailing_slashes.rs b/tests/generated/preview1_remove_directory_trailing_slashes.rs
index 85941bbd7..26a077270 100644
--- a/tests/generated/preview1_remove_directory_trailing_slashes.rs
+++ b/tests/generated/preview1_remove_directory_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_remove_directory_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_remove_nonempty_directory.rs b/tests/generated/preview1_remove_nonempty_directory.rs
index a02a504dd..4668cdb86 100644
--- a/tests/generated/preview1_remove_nonempty_directory.rs
+++ b/tests/generated/preview1_remove_nonempty_directory.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_remove_nonempty_directory() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_renumber.rs b/tests/generated/preview1_renumber.rs
index 829b4f038..dea34672e 100644
--- a/tests/generated/preview1_renumber.rs
+++ b/tests/generated/preview1_renumber.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_renumber() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_sched_yield.rs b/tests/generated/preview1_sched_yield.rs
index 441f39343..e3def63d1 100644
--- a/tests/generated/preview1_sched_yield.rs
+++ b/tests/generated/preview1_sched_yield.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_sched_yield() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio.rs b/tests/generated/preview1_stdio.rs
index 2a347efdb..5f8f1f49b 100644
--- a/tests/generated/preview1_stdio.rs
+++ b/tests/generated/preview1_stdio.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_stdio() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio_isatty.rs b/tests/generated/preview1_stdio_isatty.rs
index c3c320ea7..41b75e2e6 100644
--- a/tests/generated/preview1_stdio_isatty.rs
+++ b/tests/generated/preview1_stdio_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_stdio_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_stdio_not_isatty.rs b/tests/generated/preview1_stdio_not_isatty.rs
index 7e77f9ff9..498004857 100644
--- a/tests/generated/preview1_stdio_not_isatty.rs
+++ b/tests/generated/preview1_stdio_not_isatty.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_stdio_not_isatty() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_create.rs b/tests/generated/preview1_symlink_create.rs
index aa694d8ec..cb8609790 100644
--- a/tests/generated/preview1_symlink_create.rs
+++ b/tests/generated/preview1_symlink_create.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_symlink_create() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_filestat.rs b/tests/generated/preview1_symlink_filestat.rs
index be884c133..538532d71 100644
--- a/tests/generated/preview1_symlink_filestat.rs
+++ b/tests/generated/preview1_symlink_filestat.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_symlink_filestat() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_symlink_loop.rs b/tests/generated/preview1_symlink_loop.rs
index 447708d79..6d133f125 100644
--- a/tests/generated/preview1_symlink_loop.rs
+++ b/tests/generated/preview1_symlink_loop.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_symlink_loop() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_unicode_output.rs b/tests/generated/preview1_unicode_output.rs
index c3b60eb8b..39680cadc 100644
--- a/tests/generated/preview1_unicode_output.rs
+++ b/tests/generated/preview1_unicode_output.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_unicode_output() -> anyhow::Result<()> {
diff --git a/tests/generated/preview1_unlink_file_trailing_slashes.rs b/tests/generated/preview1_unlink_file_trailing_slashes.rs
index 3797f1d76..14d8ccd29 100644
--- a/tests/generated/preview1_unlink_file_trailing_slashes.rs
+++ b/tests/generated/preview1_unlink_file_trailing_slashes.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview1_unlink_file_trailing_slashes() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_ip_name_lookup.rs b/tests/generated/preview2_ip_name_lookup.rs
index 832a9fe80..e7450ccdb 100644
--- a/tests/generated/preview2_ip_name_lookup.rs
+++ b/tests/generated/preview2_ip_name_lookup.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_ip_name_lookup() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_random.rs b/tests/generated/preview2_random.rs
index 148b433ac..ff4f75543 100644
--- a/tests/generated/preview2_random.rs
+++ b/tests/generated/preview2_random.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_random() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_sleep.rs b/tests/generated/preview2_sleep.rs
index 9431c7dcb..c8a7e2fdd 100644
--- a/tests/generated/preview2_sleep.rs
+++ b/tests/generated/preview2_sleep.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_sleep() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_stream_pollable_correct.rs b/tests/generated/preview2_stream_pollable_correct.rs
index 071e94911..932170850 100644
--- a/tests/generated/preview2_stream_pollable_correct.rs
+++ b/tests/generated/preview2_stream_pollable_correct.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_stream_pollable_correct() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_stream_pollable_traps.rs b/tests/generated/preview2_stream_pollable_traps.rs
index 7c1f6289f..d9b68927f 100644
--- a/tests/generated/preview2_stream_pollable_traps.rs
+++ b/tests/generated/preview2_stream_pollable_traps.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_stream_pollable_traps() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_bind.rs b/tests/generated/preview2_tcp_bind.rs
index 503a86f89..55ac5ee1d 100644
--- a/tests/generated/preview2_tcp_bind.rs
+++ b/tests/generated/preview2_tcp_bind.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_bind() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_connect.rs b/tests/generated/preview2_tcp_connect.rs
index c4b2ddab7..acba5b19d 100644
--- a/tests/generated/preview2_tcp_connect.rs
+++ b/tests/generated/preview2_tcp_connect.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_connect() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_sample_application.rs b/tests/generated/preview2_tcp_sample_application.rs
index da19eb861..9cf3a8406 100644
--- a/tests/generated/preview2_tcp_sample_application.rs
+++ b/tests/generated/preview2_tcp_sample_application.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_sample_application() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_sockopts.rs b/tests/generated/preview2_tcp_sockopts.rs
index f661da6d2..4dbadfa5f 100644
--- a/tests/generated/preview2_tcp_sockopts.rs
+++ b/tests/generated/preview2_tcp_sockopts.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_sockopts() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_tcp_states.rs b/tests/generated/preview2_tcp_states.rs
index 08b4e900f..e1b9786a8 100644
--- a/tests/generated/preview2_tcp_states.rs
+++ b/tests/generated/preview2_tcp_states.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_tcp_states() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_bind.rs b/tests/generated/preview2_udp_bind.rs
index 5bb29a27a..9c55bf139 100644
--- a/tests/generated/preview2_udp_bind.rs
+++ b/tests/generated/preview2_udp_bind.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_bind() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_connect.rs b/tests/generated/preview2_udp_connect.rs
index bfd72a69f..7a58a5e7d 100644
--- a/tests/generated/preview2_udp_connect.rs
+++ b/tests/generated/preview2_udp_connect.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_connect() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_sample_application.rs b/tests/generated/preview2_udp_sample_application.rs
index 76004653e..4c1b2c959 100644
--- a/tests/generated/preview2_udp_sample_application.rs
+++ b/tests/generated/preview2_udp_sample_application.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_sample_application() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_sockopts.rs b/tests/generated/preview2_udp_sockopts.rs
index 20c0e7fb1..2a5aab662 100644
--- a/tests/generated/preview2_udp_sockopts.rs
+++ b/tests/generated/preview2_udp_sockopts.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_sockopts() -> anyhow::Result<()> {
diff --git a/tests/generated/preview2_udp_states.rs b/tests/generated/preview2_udp_states.rs
index 855f82eca..9525988fb 100644
--- a/tests/generated/preview2_udp_states.rs
+++ b/tests/generated/preview2_udp_states.rs
@@ -1,9 +1,9 @@
 //! 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};
-use std::fs;
 
 #[test]
 fn preview2_udp_states() -> anyhow::Result<()> {
diff --git a/xtask/src/generate/tests.rs b/xtask/src/generate/tests.rs
index 790904ed5..7b680766c 100644
--- a/xtask/src/generate/tests.rs
+++ b/xtask/src/generate/tests.rs
@@ -77,9 +77,9 @@ 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}};
-use std::fs;
 
 #[test]
 fn {test_name}() -> anyhow::Result<()> {{

From 763d262a2bbe831a3bcdf7f298b22742e84d59ab Mon Sep 17 00:00:00 2001
From: Guy Bedford <gbedford@fastly.com>
Date: Tue, 21 Nov 2023 17:07:06 -0800
Subject: [PATCH 8/8] fixup

---
 packages/preview2-shim/lib/nodejs/filesystem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/preview2-shim/lib/nodejs/filesystem.js b/packages/preview2-shim/lib/nodejs/filesystem.js
index 375bfda5a..93514a556 100644
--- a/packages/preview2-shim/lib/nodejs/filesystem.js
+++ b/packages/preview2-shim/lib/nodejs/filesystem.js
@@ -70,7 +70,7 @@ class Descriptor {
   static _createPreopen(hostPreopen) {
     const descriptor = new Descriptor();
     descriptor.#hostPreopen = hostPreopen.endsWith("/")
-      ? hostPreopen.slice(0, -1)
+      ? hostPreopen.slice(0, -1) || '/'
       : hostPreopen;
     return descriptor;
   }