Skip to content

Commit 461e45c

Browse files
sunfishcodesunfishcode
committed
Re-enable disabled tests, remove logging from the worlds.
1 parent ab74230 commit 461e45c

File tree

12 files changed

+74
-55
lines changed

12 files changed

+74
-55
lines changed

‎Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/run-tests.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,13 @@
22

33
cargo test \
44
--features "test-programs/test_programs" \
5-
--package test-programs \
5+
--features wasi-threads \
6+
--features wasi-http \
7+
--features component-model \
8+
--workspace \
9+
--exclude 'wasmtime-wasi-*' \
10+
--exclude wasi-tests \
11+
--exclude wasi-http-tests \
12+
--exclude command-tests \
13+
--exclude reactor-tests \
614
$@

‎crates/test-programs/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use wit_component::ComponentEncoder;
1010
// NB: this is set to `false` when a breaking change to WIT is made since the
1111
// wasi-http WIT is currently a submodule and can't be updated atomically with
1212
// the rest of Wasmtime.
13-
const BUILD_WASI_HTTP_TESTS: bool = false;
13+
const BUILD_WASI_HTTP_TESTS: bool = true;
1414

1515
fn main() {
1616
#[cfg(feature = "test_programs")]

‎crates/wasi-http/src/types.rs

+49-13
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use crate::{
1010
use std::any::Any;
1111
use std::pin::Pin;
1212
use std::task;
13-
use wasmtime_wasi::preview2::{AbortOnDropJoinHandle, Table, TableError};
1413
use wasmtime::component::Resource;
14+
use wasmtime_wasi::preview2::{AbortOnDropJoinHandle, Table, TableError};
1515

1616
/// Capture the state necessary for use in the wasi-http API implementation.
1717
pub struct WasiHttpCtx;
@@ -144,13 +144,31 @@ pub trait TableHttpExt {
144144
id: u32,
145145
) -> Result<HostFutureIncomingResponse, TableError>;
146146

147-
fn push_incoming_body(&mut self, body: HostIncomingBody) -> Result<Resource<IncomingBody>, TableError>;
148-
fn get_incoming_body(&mut self, id: &Resource<IncomingBody>) -> Result<&mut HostIncomingBody, TableError>;
149-
fn delete_incoming_body(&mut self, id: Resource<IncomingBody>) -> Result<HostIncomingBody, TableError>;
147+
fn push_incoming_body(
148+
&mut self,
149+
body: HostIncomingBody,
150+
) -> Result<Resource<IncomingBody>, TableError>;
151+
fn get_incoming_body(
152+
&mut self,
153+
id: &Resource<IncomingBody>,
154+
) -> Result<&mut HostIncomingBody, TableError>;
155+
fn delete_incoming_body(
156+
&mut self,
157+
id: Resource<IncomingBody>,
158+
) -> Result<HostIncomingBody, TableError>;
150159

151-
fn push_outgoing_body(&mut self, body: HostOutgoingBody) -> Result<Resource<OutgoingBody>, TableError>;
152-
fn get_outgoing_body(&mut self, id: &Resource<OutgoingBody>) -> Result<&mut HostOutgoingBody, TableError>;
153-
fn delete_outgoing_body(&mut self, id: Resource<OutgoingBody>) -> Result<HostOutgoingBody, TableError>;
160+
fn push_outgoing_body(
161+
&mut self,
162+
body: HostOutgoingBody,
163+
) -> Result<Resource<OutgoingBody>, TableError>;
164+
fn get_outgoing_body(
165+
&mut self,
166+
id: &Resource<OutgoingBody>,
167+
) -> Result<&mut HostOutgoingBody, TableError>;
168+
fn delete_outgoing_body(
169+
&mut self,
170+
id: Resource<OutgoingBody>,
171+
) -> Result<HostOutgoingBody, TableError>;
154172

155173
fn push_future_trailers(
156174
&mut self,
@@ -256,27 +274,45 @@ impl TableHttpExt for Table {
256274
self.delete(id)
257275
}
258276

259-
fn push_incoming_body(&mut self, body: HostIncomingBody) -> Result<Resource<IncomingBody>, TableError> {
277+
fn push_incoming_body(
278+
&mut self,
279+
body: HostIncomingBody,
280+
) -> Result<Resource<IncomingBody>, TableError> {
260281
Ok(Resource::new_own(self.push(Box::new(body))?))
261282
}
262283

263-
fn get_incoming_body(&mut self, id: &Resource<IncomingBody>) -> Result<&mut HostIncomingBody, TableError> {
284+
fn get_incoming_body(
285+
&mut self,
286+
id: &Resource<IncomingBody>,
287+
) -> Result<&mut HostIncomingBody, TableError> {
264288
self.get_mut(id.rep())
265289
}
266290

267-
fn delete_incoming_body(&mut self, id: Resource<IncomingBody>) -> Result<HostIncomingBody, TableError> {
291+
fn delete_incoming_body(
292+
&mut self,
293+
id: Resource<IncomingBody>,
294+
) -> Result<HostIncomingBody, TableError> {
268295
self.delete(id.rep())
269296
}
270297

271-
fn push_outgoing_body(&mut self, body: HostOutgoingBody) -> Result<Resource<OutgoingBody>, TableError> {
298+
fn push_outgoing_body(
299+
&mut self,
300+
body: HostOutgoingBody,
301+
) -> Result<Resource<OutgoingBody>, TableError> {
272302
Ok(Resource::new_own(self.push(Box::new(body))?))
273303
}
274304

275-
fn get_outgoing_body(&mut self, id: &Resource<OutgoingBody>) -> Result<&mut HostOutgoingBody, TableError> {
305+
fn get_outgoing_body(
306+
&mut self,
307+
id: &Resource<OutgoingBody>,
308+
) -> Result<&mut HostOutgoingBody, TableError> {
276309
self.get_mut(id.rep())
277310
}
278311

279-
fn delete_outgoing_body(&mut self, id: Resource<OutgoingBody>) -> Result<HostOutgoingBody, TableError> {
312+
fn delete_outgoing_body(
313+
&mut self,
314+
id: Resource<OutgoingBody>,
315+
) -> Result<HostOutgoingBody, TableError> {
280316
self.delete(id.rep())
281317
}
282318

‎crates/wasi-http/src/types_impl.rs

+14-20
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
use crate::bindings::{
2-
http::types::{
3-
Error, Fields, FutureIncomingResponse, FutureTrailers, Headers, IncomingBody, IncomingRequest,
4-
IncomingResponse, Method, OutgoingBody, OutgoingRequest, OutgoingResponse, ResponseOutparam,
5-
Scheme, StatusCode, Trailers,
6-
},
1+
use crate::bindings::http::types::{
2+
Error, Fields, FutureIncomingResponse, FutureTrailers, Headers, IncomingBody, IncomingRequest,
3+
IncomingResponse, Method, OutgoingBody, OutgoingRequest, OutgoingResponse, ResponseOutparam,
4+
Scheme, StatusCode, Trailers,
75
};
86
use crate::body::{HostFutureTrailers, HostFutureTrailersState};
97
use crate::types::FieldMap;
@@ -17,12 +15,12 @@ use crate::{
1715
};
1816
use anyhow::{anyhow, Context};
1917
use std::any::Any;
18+
use wasmtime::component::Resource;
2019
use wasmtime_wasi::preview2::{
21-
bindings::io::streams::{InputStream, OutputStream},
2220
bindings::io::poll::Pollable,
21+
bindings::io::streams::{InputStream, OutputStream},
2322
HostPollable, PollableFuture, TablePollableExt, TableStreamExt,
2423
};
25-
use wasmtime::component::Resource;
2624

2725
impl<T: WasiHttpView> crate::bindings::http::types::Host for T {
2826
fn drop_fields(&mut self, fields: Fields) -> wasmtime::Result<()> {
@@ -274,7 +272,10 @@ impl<T: WasiHttpView> crate::bindings::http::types::Host for T {
274272
Ok(())
275273
}
276274

277-
fn future_trailers_subscribe(&mut self, index: FutureTrailers) -> wasmtime::Result<Resource<Pollable>> {
275+
fn future_trailers_subscribe(
276+
&mut self,
277+
index: FutureTrailers,
278+
) -> wasmtime::Result<Resource<Pollable>> {
278279
// Eagerly force errors about the validity of the index.
279280
let _ = self.table().get_future_trailers(index)?;
280281

@@ -438,11 +439,7 @@ impl<T: WasiHttpView> crate::bindings::http::types::HostOutgoingBody for T {
438439
}
439440
}
440441

441-
fn write_trailers(
442-
&mut self,
443-
id: Resource<OutgoingBody>,
444-
ts: Trailers,
445-
) -> wasmtime::Result<()> {
442+
fn write_trailers(&mut self, id: Resource<OutgoingBody>, ts: Trailers) -> wasmtime::Result<()> {
446443
let mut body = self.table().delete_outgoing_body(id)?;
447444
let trailers = self.table().get_fields(ts)?.clone();
448445

@@ -462,11 +459,8 @@ impl<T: WasiHttpView> crate::bindings::http::types::HostOutgoingBody for T {
462459
Ok(())
463460
}
464461

465-
fn drop(
466-
&mut self,
467-
id: Resource<OutgoingBody>
468-
) -> wasmtime::Result<()> {
469-
let _ = self.table().delete_outgoing_body(id)?;
470-
Ok(())
462+
fn drop(&mut self, id: Resource<OutgoingBody>) -> wasmtime::Result<()> {
463+
let _ = self.table().delete_outgoing_body(id)?;
464+
Ok(())
471465
}
472466
}

‎crates/wasi-http/wit/deps/cli/reactor.wit

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ world reactor {
1818
import wasi:random/insecure-seed
1919
import wasi:io/poll
2020
import wasi:io/streams
21-
import wasi:logging/logging
2221

2322
import environment
2423
import exit

‎crates/wasi-http/wit/main.wit

-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ world preview1-adapter-reactor {
3030
import wasi:cli/terminal-stdin
3131
import wasi:cli/terminal-stdout
3232
import wasi:cli/terminal-stderr
33-
import wasi:logging/logging
3433
}

‎crates/wasi/src/preview2/command.rs

-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ pub fn add_to_linker<T: WasiView + Sync>(
5656
crate::preview2::bindings::sockets::tcp_create_socket::add_to_linker(l, |t| t)?;
5757
crate::preview2::bindings::sockets::instance_network::add_to_linker(l, |t| t)?;
5858
crate::preview2::bindings::sockets::network::add_to_linker(l, |t| t)?;
59-
crate::preview2::bindings::logging::logging::add_to_linker(l, |t| t)?;
6059
Ok(())
6160
}
6261

@@ -119,7 +118,6 @@ pub mod sync {
119118
crate::preview2::bindings::sockets::tcp_create_socket::add_to_linker(l, |t| t)?;
120119
crate::preview2::bindings::sockets::instance_network::add_to_linker(l, |t| t)?;
121120
crate::preview2::bindings::sockets::network::add_to_linker(l, |t| t)?;
122-
crate::preview2::bindings::logging::logging::add_to_linker(l, |t| t)?;
123121
Ok(())
124122
}
125123
}

‎crates/wasi/src/preview2/host/logging.rs

-13
This file was deleted.

‎crates/wasi/src/preview2/host/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ mod exit;
44
pub(crate) mod filesystem;
55
mod instance_network;
66
mod io;
7-
mod logging;
87
mod network;
98
mod random;
109
mod tcp;

‎crates/wasi/wit/deps/cli/reactor.wit

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ world reactor {
1818
import wasi:random/insecure-seed
1919
import wasi:io/poll
2020
import wasi:io/streams
21-
import wasi:logging/logging
2221

2322
import environment
2423
import exit

‎crates/wasi/wit/main.wit

-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ world preview1-adapter-reactor {
3030
import wasi:cli/terminal-stdin
3131
import wasi:cli/terminal-stdout
3232
import wasi:cli/terminal-stderr
33-
import wasi:logging/logging
3433
}

0 commit comments

Comments
 (0)