x.net: use port 45123 in tcp_test.v, preventing sporadic `socket error 98` conflicts with websocket_test.v

pull/6195/head
Delyan Angelov 2020-08-22 15:29:29 +03:00
parent 94ced907d2
commit 0bdb096bfa
1 changed files with 18 additions and 22 deletions

View File

@ -1,6 +1,10 @@
import x.net as net import x.net
import time import time
const (
test_port = 45123
)
fn handle_conn(_c net.TcpConn) { fn handle_conn(_c net.TcpConn) {
mut c := _c mut c := _c
// arbitrary timeouts to ensure that it doesnt // arbitrary timeouts to ensure that it doesnt
@ -8,12 +12,11 @@ fn handle_conn(_c net.TcpConn) {
c.set_read_timeout(10 * time.second) c.set_read_timeout(10 * time.second)
c.set_write_timeout(10 * time.second) c.set_write_timeout(10 * time.second)
for { for {
buf := []byte{ len: 100, init: 0 } buf := []byte{len: 100, init: 0}
read := c.read_into(mut buf) or { read := c.read_into(mut buf) or {
println('Server: connection dropped') println('Server: connection dropped')
return return
} }
c.write(buf[..read]) or { c.write(buf[..read]) or {
println('Server: connection dropped') println('Server: connection dropped')
return return
@ -23,51 +26,44 @@ fn handle_conn(_c net.TcpConn) {
fn echo_server(l net.TcpListener) ? { fn echo_server(l net.TcpListener) ? {
for { for {
new_conn := l.accept() or { continue } new_conn := l.accept() or {
continue
}
go handle_conn(new_conn) go handle_conn(new_conn)
} }
return none return none
} }
fn echo() ? { fn echo() ? {
mut c := net.dial_tcp('127.0.0.1:30000')? mut c := net.dial_tcp('127.0.0.1:$test_port')?
defer { c.close() or {} } defer {
c.close() or { }
}
// arbitrary timeouts to ensure that it doesnt // arbitrary timeouts to ensure that it doesnt
// instantly throw its hands in the air and give up // instantly throw its hands in the air and give up
c.set_read_timeout(10 * time.second) c.set_read_timeout(10 * time.second)
c.set_write_timeout(10 * time.second) c.set_write_timeout(10 * time.second)
data := 'Hello from vlib/net!' data := 'Hello from vlib/net!'
c.write_string(data)? c.write_string(data)?
buf := []byte{len: 100, init: 0}
buf := []byte{ len: 100, init: 0 }
read := c.read_into(mut buf)? read := c.read_into(mut buf)?
assert read == data.len assert read == data.len
for i := 0; i < read; i++ { for i := 0; i < read; i++ {
assert buf[i] == data[i] assert buf[i] == data[i]
} }
println('Got "$buf.bytestr()"')
println('Got "${buf.bytestr()}"')
return none return none
} }
fn test_tcp() { fn test_tcp() {
l := net.listen_tcp(30000) or { l := net.listen_tcp(test_port) or {
panic(err) panic(err)
} }
go echo_server(l) go echo_server(l)
echo() or { echo() or {
panic(err) panic(err)
} }
l.close() or { }
l.close() or {
}
} }
fn main() { fn main() {