From e890570b32fc0f93db979a7bdc1fc0005537592f Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 15 Sep 2025 16:37:52 +0200 Subject: [PATCH] wasi:filesystem@0.3.0-rc-2025-09-16: Add tests for mkdir/rmdir --- .../src/bin/filesystem-mkdir-rmdir.json | 3 + .../src/bin/filesystem-mkdir-rmdir.rs | 103 ++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 tests/rust/wasm32-wasip3/src/bin/filesystem-mkdir-rmdir.json create mode 100644 tests/rust/wasm32-wasip3/src/bin/filesystem-mkdir-rmdir.rs diff --git a/tests/rust/wasm32-wasip3/src/bin/filesystem-mkdir-rmdir.json b/tests/rust/wasm32-wasip3/src/bin/filesystem-mkdir-rmdir.json new file mode 100644 index 000000000..ff216a756 --- /dev/null +++ b/tests/rust/wasm32-wasip3/src/bin/filesystem-mkdir-rmdir.json @@ -0,0 +1,3 @@ +{ + "dirs": ["fs-tests.dir"] +} diff --git a/tests/rust/wasm32-wasip3/src/bin/filesystem-mkdir-rmdir.rs b/tests/rust/wasm32-wasip3/src/bin/filesystem-mkdir-rmdir.rs new file mode 100644 index 000000000..5b5958e3d --- /dev/null +++ b/tests/rust/wasm32-wasip3/src/bin/filesystem-mkdir-rmdir.rs @@ -0,0 +1,103 @@ +use std::process; +extern crate wit_bindgen; + +wit_bindgen::generate!({ + inline: r" + package test:test; + + world test { + include wasi:filesystem/imports@0.3.0-rc-2025-09-16; + include wasi:cli/command@0.3.0-rc-2025-09-16; + } +", + additional_derives: [PartialEq, Eq, Hash, Clone], + // Work around https://github.com/bytecodealliance/wasm-tools/issues/2285. + features:["clocks-timezone"], + generate_all +}); + +use wasi::filesystem::types::Descriptor; +use wasi::filesystem::types::ErrorCode; + +async fn test_mkdir_rmdir(dir: &Descriptor) { + let mkdir = |path: &str| dir.create_directory_at(path.to_string()); + let rmdir = |path: &str| dir.remove_directory_at(path.to_string()); + + // create-directory-at: async func(path: string) -> result<_, error-code>; + assert_eq!(dir.create_directory_at("".to_string()).await, + Err(ErrorCode::NoEntry)); + assert_eq!(mkdir(".").await, Err(ErrorCode::Exist)); + assert_eq!(mkdir("..").await, Err(ErrorCode::NotPermitted)); + assert_eq!(mkdir("parent/foo").await, Err(ErrorCode::NotPermitted)); + assert_eq!(mkdir("/").await, Err(ErrorCode::NotPermitted)); + assert_eq!( + mkdir("../fs-tests.dir/q.cleanup").await, + Err(ErrorCode::NotPermitted) + ); + assert_eq!( + mkdir("parent/fs-tests.dir/q.cleanup").await, + Err(ErrorCode::NotPermitted) + ); + assert_eq!(mkdir("a.txt").await, Err(ErrorCode::Exist)); + mkdir("q.cleanup").await.unwrap(); + assert_eq!( + rmdir("../fs-tests.dir/q.cleanup").await, + Err(ErrorCode::NotPermitted) + ); + assert_eq!( + rmdir("parent/fs-tests.dir/q.cleanup").await, + Err(ErrorCode::NotPermitted) + ); + assert_eq!(rmdir("q.cleanup/").await, Err(ErrorCode::Invalid)); + assert_eq!( + rmdir("q.cleanup/../../fs-tests.dir/q.cleanup").await, + Err(ErrorCode::NotPermitted) + ); + rmdir("q.cleanup").await.unwrap(); + mkdir("q.cleanup/").await.unwrap(); + rmdir("q.cleanup").await.unwrap(); + mkdir("q.cleanup").await.unwrap(); + // FIXME: https://github.com/bytecodealliance/wasmtime/issues/11524 + // rmdir("q.cleanup/") + // .await.unwrap(); + // mkdir("q.cleanup/////") + // .await.unwrap(); + // rmdir("q.cleanup////////////") + // .await.unwrap(); + // Using this instead to clean up: + rmdir("q.cleanup").await.unwrap(); + + // remove-directory-at: async func(path: string) -> result<_, error-code>; + assert_eq!(rmdir("").await, Err(ErrorCode::NoEntry)); + assert_eq!(rmdir(".").await, Err(ErrorCode::Invalid)); + assert_eq!(rmdir("..").await, Err(ErrorCode::NotPermitted)); + assert_eq!(rmdir("/").await, Err(ErrorCode::NotPermitted)); + assert_eq!(rmdir("a.txt").await, Err(ErrorCode::NotDirectory)); + assert_eq!(rmdir("z.txt").await, Err(ErrorCode::NoEntry)); + assert_eq!(rmdir("parent").await, Err(ErrorCode::NotDirectory)); + assert_eq!( + rmdir("parent/fs-tests.dir").await, + Err(ErrorCode::NotPermitted) + ); +} + +struct Component; +export!(Component); +impl exports::wasi::cli::run::Guest for Component { + async fn run() -> Result<(), ()> { + match &wasi::filesystem::preopens::get_directories()[..] { + [(dir, dirname)] if dirname == "fs-tests.dir" => { + test_mkdir_rmdir(dir).await; + } + [..] => { + eprintln!("usage: run with one open dir named 'fs-tests.dir'"); + process::exit(1) + } + }; + Ok(()) + } +} + +fn main() { + unreachable!("main is a stub"); +}