mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

all: bring back panic(err.msg) -> panic(err) (#9022)

Browse Source
This commit is contained in:
spaceface
2021-03-01 00:18:14 +01:00
committed by GitHub
parent ce115dcbe0
commit b712af56fd
110 changed files with 383 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/x/websocket/tests/autobahn/autobahn_client.v
View File

@ -29,5 +29,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
ws.write(msg.payload, msg.opcode) or { panic(err) }
}

2
vlib/x/websocket/tests/autobahn/autobahn_client_wss.v
View File

@ -31,5 +31,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
ws.write(msg.payload, msg.opcode) or { panic(err) }
}

4
vlib/x/websocket/tests/autobahn/autobahn_server.v
View File

@ -6,7 +6,7 @@ import x.websocket
fn main() {
mut s := websocket.new_server(9002, '/')
s.on_message(on_message)
s.listen() or { panic(err.msg) }
s.listen() or { panic(err) }
}
fn handle_case(case_nr int) ? {
@ -23,5 +23,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
ws.write(msg.payload, msg.opcode) or { panic(err) }
}

2
vlib/x/websocket/tests/autobahn/local_run/autobahn_client.v
View File

@ -29,5 +29,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
ws.write(msg.payload, msg.opcode) or { panic(err) }
}

2
vlib/x/websocket/tests/autobahn/local_run/autobahn_client_wss.v
View File

@ -31,5 +31,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
ws.write(msg.payload, msg.opcode) or { panic(err) }
}

2
vlib/x/websocket/websocket_client.v
View File

@ -146,7 +146,7 @@ pub fn (mut ws Client) listen() ? {
ws.logger.error('error in message callback sending PONG: $err')
ws.send_error_event('error in message callback sending PONG: $err')
if ws.panic_on_callback {
panic(err.msg)
panic(err)
}
continue
}

6
vlib/x/websocket/websocket_test.v
View File

@ -40,8 +40,8 @@ fn start_server(listen_port int) ? {
}) ?
s.on_message(fn (mut ws websocket.Client, msg &websocket.Message) ? {
match msg.opcode {
.pong { ws.write_str('pong') or { panic(err.msg) } }
else { ws.write(msg.payload, msg.opcode) or { panic(err.msg) } }
.pong { ws.write_str('pong') or { panic(err) } }
else { ws.write(msg.payload, msg.opcode) or { panic(err) } }
}
})
@ -96,7 +96,7 @@ fn ws_test(uri string) ? {
}
// sleep to give time to recieve response before asserts
time.sleep(1500 * time.millisecond)
// We expect at least 2 pongs, one sent directly and one indirectly
// We expect at least 2 pongs, one sent directly and one indirectly
assert test_results.nr_pong_received >= 2
assert test_results.nr_messages == 2
}