Remove now-unused Buf_io and associated tests

Signed-off-by: Rob Hoes <[email protected]>
psafont · Oct 17, 2024 · 8e02455 · 8e02455
1 parent ff9ce6d
commit 8e02455
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 382 deletions.
diff --git a/ocaml/database/database_server_main.ml b/ocaml/database/database_server_main.ml
@@ -80,9 +80,9 @@ let _ =
         let socket = Http_svr.bind sockaddr "unix_rpc" in
         let server = Http_svr.Server.empty () in
         Http_svr.Server.add_handler server Http.Post "/post_remote_db_access"
-          (Http_svr.BufIO remote_database_access_handler_v1) ;
+          remote_database_access_handler_v1 ;
         Http_svr.Server.add_handler server Http.Post "/post_remote_db_access_v2"
-          (Http_svr.BufIO remote_database_access_handler_v2) ;
+          remote_database_access_handler_v2 ;
         Http_svr.start ~conn_limit:1024 server socket ;
         Printf.printf "server listening\n%!" ;
         if !self_test then (

diff --git a/ocaml/libs/http-lib/buf_io.ml b/ocaml/libs/http-lib/buf_io.ml
diff --git a/ocaml/libs/http-lib/buf_io.mli b/ocaml/libs/http-lib/buf_io.mli
diff --git a/ocaml/libs/http-lib/bufio_test.ml b/ocaml/libs/http-lib/bufio_test.ml
diff --git a/ocaml/libs/http-lib/bufio_test.mli b/ocaml/libs/http-lib/bufio_test.mli
diff --git a/ocaml/libs/http-lib/bufio_test_run.ml b/ocaml/libs/http-lib/bufio_test_run.ml
diff --git a/ocaml/libs/http-lib/bufio_test_run.mli b/ocaml/libs/http-lib/bufio_test_run.mli
diff --git a/ocaml/libs/http-lib/dune b/ocaml/libs/http-lib/dune
@@ -3,7 +3,7 @@
   (public_name http-lib)
   (modes best)
   (wrapped false)
-  (modules (:standard \ http_svr http_proxy server_io http_test radix_tree_test test_client test_server bufio_test bufio_test_run))
+  (modules (:standard \ http_svr http_proxy server_io http_test radix_tree_test test_client test_server))
   (preprocess (per_module ((pps ppx_deriving_rpc) Http)))
   (libraries
     astring
@@ -67,42 +67,6 @@
   )
 )
 
-(test
-  (name bufio_test_run)
-  (package http-lib)
-  (modes (best exe))
-  (modules bufio_test_run)
-  (libraries
-    qcheck-core.runner
-    bufio_test
-  )
-  ; use fixed seed to avoid causing random failures in CI and package builds
-  (action (run %{test} -v -bt --seed 42))
-)
-
-(library
-  (name bufio_test)
-  (modes best)
-  (modules bufio_test)
-  (libraries
-    fmt
-    mtime
-    mtime.clock
-    mtime.clock.os
-    rresult
-    http_lib
-    qcheck-core
-    xapi_fd_test
-  )
-)
-
-(rule
-  (alias stresstest)
-  (deps bufio_test_run.exe)
-  ; use default random seed on stresstests
-  (action (run %{deps} -v -bt))
-)
-
 (executable
   (modes exe)
   (name test_client)