balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CI: use IPv4 in p2p tests

Browse Source
This commit is contained in:
Benjamin Canou 2018-07-06 17:20:02 +02:00
parent 9bc9768e17
commit 8aec39d8bb
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -147,17 +147,17 @@ test:shell:
test:p2p:io-scheduler: test:p2p:io-scheduler:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_p2p/runtest_p2p_io_scheduler - jbuilder build @src/lib_p2p/runtest_p2p_io_scheduler_ipv4
test:p2p:socket: test:p2p:socket:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_p2p/runtest_p2p_socket - jbuilder build @src/lib_p2p/runtest_p2p_socket_ipv4
test:p2p:pool: test:p2p:pool:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_p2p/runtest_p2p_pool - jbuilder build @src/lib_p2p/runtest_p2p_pool_ipv4
test:proto_alpha: test:proto_alpha:
<<: *test_definition <<: *test_definition

19
src/lib_p2p/test/jbuild
View File

@ -47,6 +47,25 @@
--max-download-speed 1048576 ;; 1 << 20 = 1MB --max-download-speed 1048576 ;; 1 << 20 = 1MB
)))) ))))
(alias
((name runtest_p2p_socket_ipv4)
(action (run ${exe:test_p2p_socket.exe} -v
--addr "::ffff:127.0.0.1"))))
(alias
((name runtest_p2p_pool_ipv4)
(action (run ${exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v
--addr "::ffff:127.0.0.1"))))
(alias
((name runtest_p2p_io_scheduler_ipv4)
(action (run ${exe:test_p2p_io_scheduler.exe}
--delay 5 --clients 8
--max-upload-speed 262144 ;; 1 << 18 = 256kB
--max-download-speed 1048576 ;; 1 << 20 = 1MB
--addr "::ffff:127.0.0.1"
))))
(alias (alias
((name runtest_p2p_ipv6set) ((name runtest_p2p_ipv6set)
(action (run ${exe:test_p2p_ipv6set.exe} -v)))) (action (run ${exe:test_p2p_ipv6set.exe} -v))))

9
src/lib_p2p/test/test_p2p_socket.ml
View File

@ -25,7 +25,7 @@
include Logging.Make (struct let name = "test.p2p.connection" end) include Logging.Make (struct let name = "test.p2p.connection" end)
let default_addr = Ipaddr.V6.localhost let addr = ref Ipaddr.V6.localhost
let proof_of_work_target = Crypto_box.make_target 16. let proof_of_work_target = Crypto_box.make_target 16.
let id1 = P2p_identity.generate proof_of_work_target let id1 = P2p_identity.generate proof_of_work_target
@ -86,7 +86,7 @@ let sync_nodes nodes =
Lwt.return err Lwt.return err
let run_nodes client server = let run_nodes client server =
listen default_addr >>= fun (main_socket, port) -> listen !addr >>= fun (main_socket, port) ->
Process.detach ~prefix:"server: " begin fun channel -> Process.detach ~prefix:"server: " begin fun channel ->
let sched = P2p_io_scheduler.create ~read_buffer_size:(1 lsl 12) () in let sched = P2p_io_scheduler.create ~read_buffer_size:(1 lsl 12) () in
server channel sched main_socket >>=? fun () -> server channel sched main_socket >>=? fun () ->
@ -96,7 +96,7 @@ let run_nodes client server =
Process.detach ~prefix:"client: " begin fun channel -> Process.detach ~prefix:"client: " begin fun channel ->
Lwt_utils_unix.safe_close main_socket >>= fun () -> Lwt_utils_unix.safe_close main_socket >>= fun () ->
let sched = P2p_io_scheduler.create ~read_buffer_size:(1 lsl 12) () in let sched = P2p_io_scheduler.create ~read_buffer_size:(1 lsl 12) () in
client channel sched default_addr port >>=? fun () -> client channel sched !addr port >>=? fun () ->
P2p_io_scheduler.shutdown sched >>= fun () -> P2p_io_scheduler.shutdown sched >>= fun () ->
return_unit return_unit
end >>= fun client_node -> end >>= fun client_node ->
@ -411,6 +411,9 @@ end
let spec = Arg.[ let spec = Arg.[
"--addr", String (fun p -> addr := Ipaddr.V6.of_string_exn p),
" Listening addr";
"-v", Unit (fun () -> "-v", Unit (fun () ->
Lwt_log_core.(add_rule "test.p2p.connection" Info) ; Lwt_log_core.(add_rule "test.p2p.connection" Info) ;
Lwt_log_core.(add_rule "p2p.connection" Info)), Lwt_log_core.(add_rule "p2p.connection" Info)),