Test_vdi_cbt: use OUnit's set comparator

for better test failure reporting - now the extra & different elements
will also be reported.

Signed-off-by: Gabor Igloi <[email protected]>

Author: gaborigloi

ocaml/xapi/ounit_comparators.ml

@@ -0,0 +1,9 @@
+module StringDiff =
+struct
+  type t = string
+  let compare = String.compare
+  let pp_printer = Format.pp_print_string
+  let pp_print_sep = OUnitDiff.pp_comma_separator
+end
+
+module StringSet = OUnitDiff.SetMake(StringDiff)

ocaml/xapi/test_pr1510.ml

@@ -4,16 +4,7 @@ open Fun
 open OUnit
 open Network_utils
 
-(* Example of using OUnitDiff with a String Set *)
-module StringDiff =
-struct
-  type t = string
-  let compare = String.compare
-  let pp_printer = Format.pp_print_string
-  let pp_print_sep = OUnitDiff.pp_comma_separator
-end
-
-module OSSet = OUnitDiff.SetMake(StringDiff)
+module OSSet = Ounit_comparators.StringSet
 
 let run_bond_prop_test props c_props c_per_iface =
   let props, per_iface_props =

ocaml/xapi/test_vdi_cbt.ml

@@ -153,8 +153,7 @@ let test_get_nbd_info =
       ; "nbd://[10e1:bdb8:05a3:0002:03ae:8a24:0371:0003]:10809/" ^ uuid ^ "?session_id=" ^ session_id
       ]
     in
-    let sort = List.sort String.compare in
-    OUnit.assert_equal ~printer:(String.concat ", ") (sort expected) (sort nbd_info)
+    Ounit_comparators.StringSet.(assert_equal (of_list expected) (of_list nbd_info))
   in
 
   let test_returns_empty_list_when_no_host_is_connected_to_sr () =