Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
Signed-off-by: Tyler Rockwood <rockwood@redpanda.com>
  • Loading branch information
rockwotj committed Oct 20, 2023
1 parent 5451adb commit 8932664
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 25 deletions.
6 changes: 6 additions & 0 deletions crates/wasmtime/src/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2349,6 +2349,12 @@ mod tests {
assert_eq!(tank.get_fuel(), u64::MAX);
assert_eq!(tank.consumed_fuel, -i64::MAX);
assert_eq!(tank.reserve_fuel, u64::MAX - (i64::MAX as u64));

tank.yield_interval = NonZeroU64::new((i64::MAX as u64) + 1);
tank.set_fuel(u64::MAX);
assert_eq!(tank.get_fuel(), u64::MAX);
assert_eq!(tank.consumed_fuel, -i64::MAX);
assert_eq!(tank.reserve_fuel, 1);
}

#[test]
Expand Down
26 changes: 1 addition & 25 deletions tests/all/fuel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ fn fuel_consumed(wasm: &[u8]) -> u64 {
let mut store = Store::new(&engine, ());
store.set_fuel(u64::MAX).unwrap();
drop(Instance::new(&mut store, &module, &[]));
(i64::MAX as u64) - store.get_fuel().unwrap()
u64::MAX - store.get_fuel().unwrap()
}

#[test]
Expand Down Expand Up @@ -179,30 +179,6 @@ fn manual_edge_cases() {
assert_eq!(store.get_fuel().unwrap(), u64::MAX);
}

#[test]
fn manual_async_edge_cases() {
let mut config = Config::new();
config.consume_fuel(true).async_support(true);
let engine = Engine::new(&config).unwrap();
let mut store = Store::new(&engine, ());

store
.fuel_async_yield_interval(NonZeroU64::new(u64::MAX))
.unwrap();
store.set_fuel(u64::MAX).unwrap();
assert_eq!(store.get_fuel().unwrap(), u64::MAX);

store.fuel_async_yield_interval(NonZeroU64::new(1)).unwrap();
store.set_fuel(u64::MAX).unwrap();
assert_eq!(store.get_fuel().unwrap(), u64::MAX);

store
.fuel_async_yield_interval(NonZeroU64::new(i64::MAX as u64))
.unwrap();
store.set_fuel(u64::MAX).unwrap();
assert_eq!(store.get_fuel().unwrap(), u64::MAX);
}

#[test]
#[cfg_attr(miri, ignore)]
fn unconditionally_trapping_memory_accesses_save_fuel_before_trapping() {
Expand Down

0 comments on commit 8932664

Please sign in to comment.