Fix unit tests: lower max_fds

Apparently 3 more fds are used now, with 10 it fails, with 11 it passes.

Signed-off-by: Edwin Török <[email protected]>

Author: edwintorok

Makefile

@@ -20,7 +20,7 @@ clean:
 	dune clean
 
 test:
-	dune runtest --profile=release
+	dune runtest --profile=release --no-buffer
 
 # requires odoc
 doc:

test/fe_test.ml

@@ -17,7 +17,7 @@ type config = {
 }
 
 let min_fds = 7
-let max_fds = 1024 - 8 (* fe daemon has a bunch for its own use *)
+let max_fds = 1024 - 11 (* fe daemon has a bunch for its own use *)
 
 let all_combinations fds = 
   let y = {
@@ -114,12 +114,13 @@ let test_exitcode () =
   Printf.printf "\nCompleted exitcode tests\n"
 
 let master fds =
+  Printf.printf "\nPerforming timeout tests\n%!";
   test_delay ();
   test_notimeout ();
-  Printf.printf "\nCompleted timeout test\n";
+  Printf.printf "\nCompleted timeout test\n%!";
   test_exitcode ();
   let combinations = shuffle (all_combinations fds) in
-  Printf.printf "Starting %d tests\n" (List.length combinations);
+  Printf.printf "Starting %d tests\n%!" (List.length combinations);
   let i = ref 0 in
   let update_progress f x = 
     incr i;

test/fe_test.sh

@@ -1,7 +1,12 @@
 #!/bin/sh
 
 ../src/fe_main.exe &
-for x in `seq 1 10`; do
+MAIN=$!
+cleanup () {
+    kill $MAIN
+}
+trap cleanup EXIT
+for _ in $(seq 1 10); do
 	test -S /var/xapi/forker/main || sleep 1
 done
 ./fe_test.exe 16