Merge pull request #29 from yoshuawuyts/pch/cargo_test

Change to use `cargo test --target wasm32-wasip2` for most testing

Author: pchickey

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.wasm32-wasip2]
+runner = "wasmtime -Shttp"

.github/workflows/ci.yaml

@@ -29,17 +29,27 @@ jobs:
         target: wasm32-wasip2
         override: true
 
+    - name: Install wasmtime
+      uses: bytecodealliance/actions/wasmtime/setup@v1
+
     - name: check
       uses: actions-rs/cargo@v1
       with:
         command: check
         args: --all --bins --examples
 
-    - name: tests
+    - name: wstd tests
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: -p wstd --target wasm32-wasip2
+
+    - name: example tests
       uses: actions-rs/cargo@v1
       with:
         command: test
-        args: --all
+        args: -p test-programs-artifacts
+
 
   check_fmt_and_docs:
     name: Checking fmt and docs

Cargo.toml

@@ -26,10 +26,6 @@ wstd-macro.workspace = true
 anyhow.workspace = true
 futures-lite.workspace = true
 serde_json.workspace = true
-test-programs-artifacts.workspace = true
-wasmtime.workspace = true
-wasmtime-wasi.workspace = true
-wasmtime-wasi-http.workspace = true
 
 [workspace]
 members = [
@@ -57,6 +53,7 @@ quote = "1.0"
 serde_json = "1"
 slab = "0.4.9"
 syn = "2.0"
+test-log = { version = "0.2", features = ["trace"] }
 test-programs = { path = "test-programs" }
 test-programs-artifacts = { path = "test-programs/artifacts" }
 wasi = "0.13.1"

macro/src/lib.rs

@@ -44,3 +44,42 @@ pub fn attr_macro_main(_attr: TokenStream, item: TokenStream) -> TokenStream {
     }
     .into()
 }
+
+#[proc_macro_attribute]
+pub fn attr_macro_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(item as ItemFn);
+
+    if input.sig.asyncness.is_none() {
+        return quote_spanned! { input.sig.fn_token.span()=>
+            compile_error!("fn must be `async fn`");
+        }
+        .into();
+    }
+
+    let name = input.sig.ident;
+
+    if !input.sig.inputs.is_empty() {
+        return quote_spanned! { input.sig.inputs.span()=>
+            compile_error!("arguments to main are not supported");
+        }
+        .into();
+    }
+    let attrs = input.attrs;
+    let output = input.sig.output;
+    let block = input.block;
+    quote! {
+        #[test]
+        pub fn #name() #output {
+
+            #(#attrs)*
+            async fn __run() #output {
+                #block
+            }
+
+            ::wstd::runtime::block_on(async {
+                __run().await
+            })
+        }
+    }
+    .into()
+}

src/lib.rs

@@ -23,7 +23,7 @@
 //! **HTTP Client**
 //!
 //! ```rust,no_run
-#![doc = include_str!("../examples/http_get.rs")]
+#![doc = include_str!("../tests/http_get.rs")]
 //! ```
 //!
 //! # Design Decisions
@@ -59,6 +59,7 @@ pub mod task;
 pub mod time;
 
 pub use wstd_macro::attr_macro_main as main;
+pub use wstd_macro::attr_macro_test as test;
 
 pub mod prelude {
     pub use crate::future::FutureExt as _;

test-programs/artifacts/Cargo.toml

@@ -7,6 +7,14 @@ publish = false
 
 [dependencies]
 
+[dev-dependencies]
+anyhow.workspace = true
+test-log.workspace = true
+test-programs-artifacts.workspace = true
+wasmtime.workspace = true
+wasmtime-wasi.workspace = true
+wasmtime-wasi-http.workspace = true
+
 [build-dependencies]
 cargo_metadata.workspace = true
 heck.workspace = true

tests/test-programs.rs renamed to test-programs/artifacts/tests/tcp_echo_server.rs

@@ -74,7 +74,7 @@ fn run_in_wasmtime(wasm: &[u8], stdout: Option<MemoryOutputPipe>) -> Result<()>
     Ok(())
 }
 
-#[test]
+#[test_log::test]
 fn tcp_echo_server() -> Result<()> {
     use std::io::{Read, Write};
     use std::net::TcpStream;
@@ -119,28 +119,3 @@ fn tcp_echo_server() -> Result<()> {
     }
     Ok(())
 }
-
-#[test]
-fn http_get() -> Result<()> {
-    println!("testing {}", test_programs_artifacts::HTTP_GET);
-    let wasm = std::fs::read(test_programs_artifacts::HTTP_GET).context("read wasm")?;
-    run_in_wasmtime(&wasm, None)
-}
-
-#[test]
-fn http_post() -> Result<()> {
-    println!("testing {}", test_programs_artifacts::HTTP_POST);
-    let wasm = std::fs::read(test_programs_artifacts::HTTP_POST).context("read wasm")?;
-    run_in_wasmtime(&wasm, None)
-}
-
-#[test]
-fn http_first_byte_timeout() -> Result<()> {
-    println!(
-        "testing {}",
-        test_programs_artifacts::HTTP_FIRST_BYTE_TIMEOUT
-    );
-    let wasm =
-        std::fs::read(test_programs_artifacts::HTTP_FIRST_BYTE_TIMEOUT).context("read wasm")?;
-    run_in_wasmtime(&wasm, None)
-}

test-programs/src/bin/http_get.rs

@@ -2,7 +2,7 @@ use std::error::Error;
 use wstd::http::{Body, Client, HeaderValue, Method, Request};
 use wstd::io::AsyncRead;
 
-#[wstd::main]
+#[wstd::test]
 async fn main() -> Result<(), Box<dyn Error>> {
     let mut request = Request::new(Method::GET, "https://postman-echo.com/get".parse()?);
     request