Fix up tests
This commit is contained in:
parent
f2a13df169
commit
81cd901ea6
@ -242,7 +242,7 @@ impl lb_tcpstream {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn read_half<'s>(&'s self) -> Result<RefMut<'s, OwnedReadHalf>> {
|
fn read_half<'s>(&'s self) -> Result<RefMut<'s, OwnedReadHalf>> {
|
||||||
let read = self.read.borrow_mut();
|
let read = self.read.try_borrow_mut()?;
|
||||||
match *read {
|
match *read {
|
||||||
Some(_) => Ok(RefMut::map(read, |s| s.as_mut().unwrap())),
|
Some(_) => Ok(RefMut::map(read, |s| s.as_mut().unwrap())),
|
||||||
None => Err(Error::SocketClosed),
|
None => Err(Error::SocketClosed),
|
||||||
@ -250,7 +250,7 @@ impl lb_tcpstream {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn write_half<'s>(&'s self) -> Result<RefMut<'s, OwnedWriteHalf>> {
|
fn write_half<'s>(&'s self) -> Result<RefMut<'s, OwnedWriteHalf>> {
|
||||||
let write = self.write.borrow_mut();
|
let write = self.write.try_borrow_mut()?;
|
||||||
match *write {
|
match *write {
|
||||||
Some(_) => Ok(RefMut::map(write, |s| s.as_mut().unwrap())),
|
Some(_) => Ok(RefMut::map(write, |s| s.as_mut().unwrap())),
|
||||||
None => Err(Error::SocketClosed),
|
None => Err(Error::SocketClosed),
|
||||||
|
@ -90,7 +90,7 @@ describe("tcp", function()
|
|||||||
spawn(function()
|
spawn(function()
|
||||||
assert(not pcall(client.read, client, 1)) -- this should fail, since the first task is still reading
|
assert(not pcall(client.read, client, 1)) -- this should fail, since the first task is still reading
|
||||||
end):await()
|
end):await()
|
||||||
server:shutdown()
|
server:close()
|
||||||
reader:await()
|
reader:await()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@ -104,7 +104,7 @@ describe("tcp", function()
|
|||||||
spawn(function()
|
spawn(function()
|
||||||
client:write("hello") -- should be able to write while the first task is reading
|
client:write("hello") -- should be able to write while the first task is reading
|
||||||
end):await()
|
end):await()
|
||||||
server:shutdown()
|
server:close()
|
||||||
reader:await()
|
reader:await()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@ -123,9 +123,7 @@ describe("tcp", function()
|
|||||||
assert(server:write("ping") == true)
|
assert(server:write("ping") == true)
|
||||||
end
|
end
|
||||||
sleep(100)
|
sleep(100)
|
||||||
server:shutdown()
|
server:close()
|
||||||
server = nil
|
|
||||||
collectgarbage()
|
|
||||||
reader:await()
|
reader:await()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@ -144,9 +142,7 @@ describe("tcp", function()
|
|||||||
assert(server:read(4) == "pong")
|
assert(server:read(4) == "pong")
|
||||||
end
|
end
|
||||||
sleep(100)
|
sleep(100)
|
||||||
server:shutdown()
|
server:close()
|
||||||
server = nil
|
|
||||||
collectgarbage()
|
|
||||||
writer:await()
|
writer:await()
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
@ -180,9 +176,9 @@ describe("tcp", function()
|
|||||||
local buf = client_stream:read(5)
|
local buf = client_stream:read(5)
|
||||||
assert(buf ~= nil and #buf == 5)
|
assert(buf ~= nil and #buf == 5)
|
||||||
assert(buf == "hello")
|
assert(buf == "hello")
|
||||||
-- shutdown
|
-- close
|
||||||
server_stream:shutdown()
|
server_stream:close()
|
||||||
client_stream:shutdown()
|
client_stream:close()
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
@ -15,7 +15,7 @@ use luaffi::{cdef, metatype};
|
|||||||
/// ```lua
|
/// ```lua
|
||||||
/// local sqlite = require("lb:sqlite")
|
/// local sqlite = require("lb:sqlite")
|
||||||
/// ```
|
/// ```
|
||||||
#[cdef(module = "lb:time")]
|
#[cdef(module = "lb:sqlite")]
|
||||||
pub struct lb_sqlitelib;
|
pub struct lb_sqlitelib;
|
||||||
|
|
||||||
#[metatype]
|
#[metatype]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user