Resurrect a database unit test #3456
Conversation
Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
ocaml/database/jbuild
Outdated
|
|
||
| (executable | ||
| ((name database_server_main) | ||
| (public_name database_server) |
There was a problem hiding this comment.
If you set a public name it'll get installed, is that what you intended?
There was a problem hiding this comment.
Ah yes, copy-pasta mistake - thanks!
| let find name t = | ||
| try | ||
| List.find (fun col -> col.Column.name = name) t.columns | ||
| with Not_found -> |
There was a problem hiding this comment.
Thanks it is always annoying when you get Not_found in the logs not knowing what was not found...
| @@ -1,3 +1,6 @@ | |||
| open Xapi_stdext_threads | |||
| open Xapi_stdext_unix | |||
| open Xapi_stdext_threads | |||
There was a problem hiding this comment.
This is already opened above
ocaml/database/database_test.ml
Outdated
|
|
||
|
|
||
| open Xapi_stdext_pervasives | ||
| open Xapi_stdext_monadic |
| let find name t = | ||
| try | ||
| List.find (fun col -> col.Column.name = name) t.columns | ||
| with Not_found -> |
ocaml/database/test_schemas.ml
Outdated
| Schema.Table.name = "VM"; | ||
| columns = [ _ref; uuid; name_label; vbds; pp; name_description; tags; other_config ]; | ||
| columns = [ _ref; uuid; name_label; vbds; pp; | ||
| name_description; tags; other_config ]; |
There was a problem hiding this comment.
Did you really mean to split them like this?
Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
| then failwith (Printf.sprintf "check_many_to_many: bar(bar:1).foos expected ('foo:1') got %s" (Schema.Value.marshal bar_foos)); | ||
|
|
||
| (* set foo.bars to [] *) | ||
| (* let foo_1 = Table.find "foo:1" (TableSet.find "foo" (Database.tableset db)) in*) |
There was a problem hiding this comment.
Why you left this line commented out?
|
|
||
|
|
||
|
|
||
| () |
There was a problem hiding this comment.
The choice of spacing and newlines are "interesting" in some part of this code 😜
There was a problem hiding this comment.
Ah, I've forgotten to ocp-indent it.
ocaml/database/database_test.ml
Outdated
|
|
||
| (* let xs = Client.read_set_ref t where_name_label in | ||
| if not (List.mem name xs) | ||
| then failwith "read_set_ref <valid table> <valid return> <valid field> <valid value>"; |
There was a problem hiding this comment.
Why you disabled this subtest?
Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
Signed-off-by: Jon Ludlam jonathan.ludlam@citrix.com