From 81cd901ea6a702dbd8ce9db3d2ea54b14c39837d Mon Sep 17 00:00:00 2001 From: luaneko Date: Mon, 30 Jun 2025 20:11:54 +1000 Subject: [PATCH] Fix up tests --- crates/lb/src/net/tcp.rs | 4 ++-- crates/lb/tests/net.lua | 18 +++++++----------- crates/lb_sqlite/src/mod.rs | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/crates/lb/src/net/tcp.rs b/crates/lb/src/net/tcp.rs index 7207d15..a573b4d 100644 --- a/crates/lb/src/net/tcp.rs +++ b/crates/lb/src/net/tcp.rs @@ -242,7 +242,7 @@ impl lb_tcpstream { } fn read_half<'s>(&'s self) -> Result> { - let read = self.read.borrow_mut(); + let read = self.read.try_borrow_mut()?; match *read { Some(_) => Ok(RefMut::map(read, |s| s.as_mut().unwrap())), None => Err(Error::SocketClosed), @@ -250,7 +250,7 @@ impl lb_tcpstream { } fn write_half<'s>(&'s self) -> Result> { - let write = self.write.borrow_mut(); + let write = self.write.try_borrow_mut()?; match *write { Some(_) => Ok(RefMut::map(write, |s| s.as_mut().unwrap())), None => Err(Error::SocketClosed), diff --git a/crates/lb/tests/net.lua b/crates/lb/tests/net.lua index d157f90..6c66ab5 100644 --- a/crates/lb/tests/net.lua +++ b/crates/lb/tests/net.lua @@ -90,7 +90,7 @@ describe("tcp", function() spawn(function() assert(not pcall(client.read, client, 1)) -- this should fail, since the first task is still reading end):await() - server:shutdown() + server:close() reader:await() end) @@ -104,7 +104,7 @@ describe("tcp", function() spawn(function() client:write("hello") -- should be able to write while the first task is reading end):await() - server:shutdown() + server:close() reader:await() end) @@ -123,9 +123,7 @@ describe("tcp", function() assert(server:write("ping") == true) end sleep(100) - server:shutdown() - server = nil - collectgarbage() + server:close() reader:await() end) @@ -144,9 +142,7 @@ describe("tcp", function() assert(server:read(4) == "pong") end sleep(100) - server:shutdown() - server = nil - collectgarbage() + server:close() writer:await() end) end) @@ -180,9 +176,9 @@ describe("tcp", function() local buf = client_stream:read(5) assert(buf ~= nil and #buf == 5) assert(buf == "hello") - -- shutdown - server_stream:shutdown() - client_stream:shutdown() + -- close + server_stream:close() + client_stream:close() end) end) end) diff --git a/crates/lb_sqlite/src/mod.rs b/crates/lb_sqlite/src/mod.rs index b83aa0d..c0c6dfd 100644 --- a/crates/lb_sqlite/src/mod.rs +++ b/crates/lb_sqlite/src/mod.rs @@ -15,7 +15,7 @@ use luaffi::{cdef, metatype}; /// ```lua /// local sqlite = require("lb:sqlite") /// ``` -#[cdef(module = "lb:time")] +#[cdef(module = "lb:sqlite")] pub struct lb_sqlitelib; #[metatype]