Skip to content

Resurrect a database unit test #3456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 27, 2018
Merged

Resurrect a database unit test #3456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ab33c6
Resurrect a database unit test
jonludlam Feb 16, 2018
65e3921
Respond to @mseri's review comments
jonludlam Feb 16, 2018
717451c
Don't install tests (pointed out by @edwintorok)
jonludlam Feb 16, 2018
69b8400
Also run the marshalling unit test
jonludlam Feb 16, 2018
0583a91
Remove read_set_ref, as it's never used
jonludlam Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ocaml/database/database_server_main.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
open Xapi_stdext_threads
open Xapi_stdext_unix
open Threadext

type mode =
Expand Down Expand Up @@ -63,15 +65,16 @@ let _ =
Unixext.unlink_safe !listen_path;
let sockaddr = Unix.ADDR_UNIX !listen_path in
let socket = Http_svr.bind sockaddr "unix_rpc" in
let server = Http_svr.Server.empty in
Http_svr.add_handler server Http.Post "/post_remote_db_access" (Http_svr.BufIO remote_database_access_handler_v1);
Http_svr.add_handler server Http.Post "/post_remote_db_access_v2" (Http_svr.BufIO remote_database_access_handler_v2);
let server = Http_svr.Server.empty () in
Http_svr.Server.add_handler server Http.Post "/post_remote_db_access" (Http_svr.BufIO remote_database_access_handler_v1);
Http_svr.Server.add_handler server Http.Post "/post_remote_db_access_v2" (Http_svr.BufIO remote_database_access_handler_v2);
Http_svr.start server socket;
Printf.printf "server listening\n%!";
if !self_test then begin
Printf.printf "Running unit-tests\n%!";
Local_tests.main true;
Printf.printf "All tests passed\n%!";
finished := true;
end;
(* Wait for either completion *)
Mutex.execute m
Expand Down
Loading