Merge pull request #48 from euanh/add-unit-testing

Check actual datasource values rather than just list lengths

Author: euanh

rrdd/test_rrdd_monitor.ml

@@ -1,46 +1,111 @@
 open OUnit2
 
-let ds_a = Ds.ds_make ~name:"datasource_a" ~units:"(fraction)"
-	~description:"datasource_a"
+let assert_equal_int = assert_equal ~printer:string_of_int
+
+let ds_a = Ds.ds_make ~name:"ds_a" ~units:"(fraction)"
+	~description:"datasource a"
 	~value:(Rrd.VT_Float 1.0)
 	~ty:Rrd.Gauge ~default:true ()
 
+let ds_b = Ds.ds_make ~name:"ds_b" ~units:"(fraction)"
+	~description:"datasource b"
+	~value:(Rrd.VT_Float 2.0)
+	~ty:Rrd.Gauge ~default:true ()
+
 let reset_rrdd_shared_state ctxt =
         Hashtbl.clear Rrdd_shared.vm_rrds;
         Rrdd_shared.host_rrd := None
 
-let update_rrds_test dss uuid_domids paused_vms
-	num_vm_rrds num_host_dss =
-	fun ctxt ->
-	OUnit2.bracket reset_rrdd_shared_state (fun () -> ignore) ctxt;
-	Rrdd_monitor.update_rrds 12345.0 dss uuid_domids paused_vms;
-	assert_equal num_vm_rrds (Hashtbl.length Rrdd_shared.vm_rrds);
+let dump_dss = List.map (fun ds -> ds.Ds.ds_name)
+
+let dump_rrd_hash hash =
+	Hashtbl.fold
+		(fun k v acc -> (k, dump_dss v.Rrdd_shared.dss) :: acc)
+		hash []
+
+let string_of_rrd_dump dump =
+	let rrds = List.map
+		(fun (k, v) ->  Printf.sprintf "(%s, [%s])" k (String.concat "; " v))
+		dump
+	in
+	Printf.sprintf "[%s]" (String.concat "; " rrds)
+
+let check_vm_rrds expected_rrds =
+	assert_equal ~printer:string_of_rrd_dump
+		(List.sort compare (dump_rrd_hash Rrdd_shared.vm_rrds))
+		(List.sort compare expected_rrds)
+
+let check_host_dss expected_dss =
 	match !Rrdd_shared.host_rrd with
 	| None -> assert_failure "host_rrd should have been created"
 	| Some info ->
-		assert_equal num_host_dss (List.length Rrdd_shared.(info.dss))
+		assert_equal ~printer:(String.concat "; ")
+			(List.sort compare (dump_dss info.Rrdd_shared.dss))
+			(List.sort compare expected_dss)
+
+let update_rrds_test ~dss ~uuid_domids ~paused_vms
+	~expected_vm_rrds ~expected_host_dss = fun ctxt ->
+	OUnit2.bracket reset_rrdd_shared_state (fun () -> ignore) ctxt;
+	Rrdd_monitor.update_rrds 12345.0 dss uuid_domids paused_vms;
+	check_vm_rrds expected_vm_rrds;
+	check_host_dss expected_host_dss
 
 let update_rrds = "update_rrds" >::: let open Rrd in [
-	("Null update" >::
-		update_rrds_test [] [] [] 0 0);
+	"Null update" >:: update_rrds_test
+		~dss:[]
+		~uuid_domids:[]
+		~paused_vms:[]
+		~expected_vm_rrds:[]
+		~expected_host_dss:[];
+
+	"Single host update" >:: update_rrds_test
+		~dss:[(Host, ds_a)]
+		~uuid_domids:[]
+		~paused_vms:[]
+		~expected_vm_rrds:[]
+		~expected_host_dss:["ds_a"];
 
-	("Single host update" >::
-		update_rrds_test [(Host, ds_a)] [] [] 0 1);
+	"Multiple host updates" >:: update_rrds_test
+		~dss:[(Host, ds_a); (Host, ds_a)]
+		~uuid_domids:[]
+		~paused_vms:[]
+		~expected_vm_rrds:[]
+		~expected_host_dss:["ds_a"; "ds_a"];
 
-	("Multiple host updates" >::
-		update_rrds_test [(Host, ds_a); (Host, ds_a)] [] [] 0 2);
+	"Single non-resident VM update" >:: update_rrds_test
+		~dss:[(VM "a", ds_a)]
+		~uuid_domids:[]
+		~paused_vms:[]
+		~expected_vm_rrds:[]
+		~expected_host_dss:[];
 
-	("Single non-resident VM update" >::
-		update_rrds_test [(VM "a", ds_a)] [] [] 0 0);
+	"Multiple non-resident VM updates" >:: update_rrds_test
+		~dss:[(VM "a", ds_a); (VM "b", ds_a)]
+		~uuid_domids:[]
+		~paused_vms:[]
+		~expected_vm_rrds:[]
+		~expected_host_dss:[];
 
-	("Multiple non-resident VM updates" >::
-		update_rrds_test [(VM "a", ds_a); (VM "b", ds_a)] [] [] 0 0);
+	"Single resident VM update" >:: update_rrds_test
+		~dss:[(VM "a", ds_a)]
+		~uuid_domids:[("a", 1)]
+		~paused_vms:[]
+		~expected_vm_rrds: ["a", ["ds_a"]]
+		~expected_host_dss:[];
 
-	("Single resident VM update" >::
-		update_rrds_test [(VM "a", ds_a)] [("a", 1)] [] 1 0);
+	"Multiple resident VM updates" >:: update_rrds_test
+		~dss:[(VM "a", ds_a); (VM "b", ds_a); (VM "b", ds_b)]
+		~uuid_domids:[("a", 1); ("b", 1)]
+		~paused_vms:[]
+		~expected_vm_rrds:["a", ["ds_a"]; "b", ["ds_a"; "ds_b"]]
+		~expected_host_dss:[];
 
-	("Multiple resident VM updates" >::
-		update_rrds_test [(VM "a", ds_a); (VM "b", ds_a)] [("a", 1); ("b", 1)] [] 2 0);
+	"Multiple resident and non-resident VM updates" >:: update_rrds_test
+		~dss:[(VM "a", ds_a); (VM "b", ds_a); (VM "c", ds_a)]
+		~uuid_domids:[("a", 1); ("b", 1)]
+		~paused_vms:[]
+		~expected_vm_rrds:["a", ["ds_a"]; "b", ["ds_a"]]
+		~expected_host_dss:[];
 ]
 
 let suite = "rrdd monitor test" >:::