Add unit tests for threadext

Signed-off-by: Steven Woods <[email protected]>

Author: snwoods

lib/xapi-stdext-threads/dune

@@ -1,9 +1,15 @@
 (library
   (public_name xapi-stdext-threads)
   (name  xapi_stdext_threads)
+  (modules :standard \ threadext_test)
   (libraries
     polly
     threads
     unix
     xapi-stdext-pervasives)
 )
+(test
+  (name threadext_test)
+  (modules threadext_test)
+  (libraries xapi_stdext_threads alcotest mtime.clock.os)
+)

lib/xapi-stdext-threads/threadext.mli

@@ -23,13 +23,13 @@ module Delay : sig
   type t
 
   val make : unit -> t
+
+  val wait : t -> float -> bool
   (** Blocks the calling thread for a given period of time with the option of
       returning early if someone calls 'signal'. Returns true if the full time
       period elapsed and false if signalled. Note that multple 'signals' are
       coalesced; 'signals' sent before 'wait' is called are not lost. *)
 
-  val wait : t -> float -> bool
-  (** Sends a signal to a waiting thread. See 'wait' *)
-
   val signal : t -> unit
+  (** Sends a signal to a waiting thread. See 'wait' *)
 end

lib/xapi-stdext-threads/threadext_test.ml

@@ -0,0 +1,30 @@
+(*
+ * Copyright (C) 2006-2009 Citrix Systems Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *)
+
+module Delay = Xapi_stdext_threads.Threadext.Delay
+
+let test_wait () =
+  let m = Delay.make () in
+  let c = Mtime_clock.counter () in
+  let expected = Mtime.Span.(5 * s) in
+  let max_error = Mtime.Span.(10 * ms) in
+  let _ = Delay.wait m 5.0 in
+  let wait_time = Mtime_clock.count c in
+  let diff = Mtime.Span.abs_diff expected wait_time in
+  let cmp = Mtime.Span.compare diff max_error in
+  Alcotest.(check bool) "diff is smaller than max error" true (cmp < 0)
+
+
+let () =
+Alcotest.run "Threadext" [("wait", [("wait", `Quick, test_wait)])]

xapi-stdext-threads.opam

@@ -8,6 +8,7 @@ homepage: "https://github.com/xapi-project/stdext"
 bug-reports: "https://github.com/xapi-project/stdext/issues"
 depends: [
   "dune" {>= "2.7"}
+  "polly"
   "ocaml"
   "base-threads"
   "base-unix"

xapi-stdext-unix.opam

@@ -8,6 +8,7 @@ homepage: "https://github.com/xapi-project/stdext"
 bug-reports: "https://github.com/xapi-project/stdext/issues"
 depends: [
   "dune" {>= "2.7"}
+  "polly"
   "ocaml"
   "base-unix"
   "fd-send-recv" {>= "2.0.0"}