simplify mina automation fixture test result type

Author: glyh

src/test/archive/archive_node_tests/archive_precomputed_blocks_test.ml

@@ -144,4 +144,4 @@ let test_case (test_data : t) =
   let%map perf_data = extract_perf_metrics log_file in
   perf_metrics_to_yojson perf_data |> Yojson.to_file "archive.perf" ;
 
-  Ok Mina_automation_fixture.Intf.Passed
+  Mina_automation_fixture.Intf.Passed

src/test/archive/archive_node_tests/live_upgrade_archive.ml

@@ -60,4 +60,4 @@ let test_case (test_data : t) =
       archive_uri temp_dir
   in
 
-  Ok Mina_automation_fixture.Intf.Passed
+  Mina_automation_fixture.Intf.Passed

src/test/archive/archive_node_tests/load_genesis_ledger.ml

@@ -43,36 +43,32 @@ let test_case (test_data : t) =
     (Float.to_string max_postgres_memory) ;
   [%log info] "Sleep Duration: %s" (Time.Span.to_string sleep_duration) ;
 
-  let%map result =
-    let end_time = Time.add (Time.now ()) duration in
-    let rec loop () =
-      if Time.is_later (Time.now ()) ~than:end_time then Deferred.return ()
-      else
-        let memory = Archive.Process.get_memory_usage_mib process in
-        let%bind () =
-          match memory with
-          | Some mem ->
-              [%log info] "Archive Memory usage: %s MiB" (Float.to_string mem) ;
-              if Float.( > ) mem max_archive_memory then
-                failwith "Archive process memory exceeds 1GB"
-              else Deferred.return ()
-          | None ->
-              failwith "Error getting memory usage for archive process"
-        in
-        let%bind memory =
-          Utils.get_memory_usage_mib_of_user_process postgres_user_name
-        in
-        [%log info] "Postgres Memory usage: %s MiB" (Float.to_string memory) ;
-        if Float.( > ) memory max_postgres_memory then
-          failwith "Postgres memory exceeds 4GB" ;
-        let%bind () = Clock.after sleep_duration in
-        loop ()
-    in
-    match%map Monitor.try_with loop with
-    | Ok () ->
-        Mina_automation_fixture.Intf.Passed
-    | Error exn ->
-        [%log error] "Test failed: %s" (Exn.to_string exn) ;
-        Failed (Exn.to_string exn)
+  let end_time = Time.add (Time.now ()) duration in
+  let rec loop () =
+    if Time.is_later (Time.now ()) ~than:end_time then Deferred.return ()
+    else
+      let memory = Archive.Process.get_memory_usage_mib process in
+      let%bind () =
+        match memory with
+        | Some mem ->
+            [%log info] "Archive Memory usage: %s MiB" (Float.to_string mem) ;
+            if Float.( > ) mem max_archive_memory then
+              failwith "Archive process memory exceeds 1GB"
+            else Deferred.return ()
+        | None ->
+            failwith "Error getting memory usage for archive process"
+      in
+      let%bind memory =
+        Utils.get_memory_usage_mib_of_user_process postgres_user_name
+      in
+      [%log info] "Postgres Memory usage: %s MiB" (Float.to_string memory) ;
+      if Float.( > ) memory max_postgres_memory then
+        failwith "Postgres memory exceeds 4GB" ;
+      let%bind () = Clock.after sleep_duration in
+      loop ()
   in
-  Ok result
+  match%map Monitor.try_with loop with
+  | Ok () ->
+      Mina_automation_fixture.Intf.Passed
+  | Error exn ->
+      Failed (Error.of_exn exn)

src/test/archive/archive_node_tests/upgrade_archive.ml

@@ -49,4 +49,4 @@ let test_case (test_data : t) =
       archive_uri temp_dir
   in
 
-  Ok Mina_automation_fixture.Intf.Passed
+  Mina_automation_fixture.Intf.Passed

src/test/command_line_tests/command_line_tests.ml

@@ -25,31 +25,33 @@ module BackgroundMode = struct
           let () = printf "Daemon logs:\n%s\n" logs in
           Writer.flushed (Lazy.force Writer.stdout)
     in
-    let%bind () = Daemon.Client.stop_daemon process.client in
-    Deferred.Or_error.return Mina_automation_fixture.Intf.Passed
+    let%map () = Daemon.Client.stop_daemon process.client in
+    Mina_automation_fixture.Intf.Passed
 end
 
 module DaemonRecover = struct
   type t = Mina_automation_fixture.Daemon.before_bootstrap
 
   let test_case (test : t) =
-    let daemon = Daemon.of_config test.config in
-    let%bind () = Daemon.Config.generate_keys test.config in
-    let ledger_file = test.config.dirs.conf ^/ "daemon.json" in
-    let%bind () =
-      Mina_automation_fixture.Daemon.generate_random_config daemon ledger_file
-    in
-    let%bind process = Daemon.start daemon in
-    let%bind.Deferred.Result () =
-      Daemon.Client.wait_for_bootstrap process.client ()
-    in
-    let%bind.Deferred.Result _ = Daemon.Process.force_kill process in
-    let%bind process = Daemon.start daemon in
-    let%bind.Deferred.Result () =
-      Daemon.Client.wait_for_bootstrap process.client ()
-    in
-    let%bind () = Daemon.Client.stop_daemon process.client in
-    Deferred.Or_error.return Mina_automation_fixture.Intf.Passed
+    (let daemon = Daemon.of_config test.config in
+     let%bind () = Daemon.Config.generate_keys test.config in
+     let ledger_file = test.config.dirs.conf ^/ "daemon.json" in
+     let%bind () =
+       Mina_automation_fixture.Daemon.generate_random_config daemon ledger_file
+     in
+     let%bind process = Daemon.start daemon in
+     let%bind.Deferred.Result () =
+       Daemon.Client.wait_for_bootstrap process.client ()
+     in
+     let%bind.Deferred.Result _ = Daemon.Process.force_kill process in
+     let%bind process = Daemon.start daemon in
+     let%bind.Deferred.Result () =
+       Daemon.Client.wait_for_bootstrap process.client ()
+     in
+     let%map () = Daemon.Client.stop_daemon process.client in
+     Ok () )
+    >>| function
+    | Ok () -> Mina_automation_fixture.Intf.Passed | Error err -> Failed err
 end
 
 let contain_log_output output =
@@ -65,16 +67,16 @@ module LedgerHash = struct
     let%bind _ =
       Mina_automation_fixture.Daemon.generate_random_accounts daemon ledger_file
     in
-    let%bind hash = Daemon.Client.ledger_hash client ~ledger_file in
-    Deferred.Or_error.return
-      ( if contain_log_output hash then
-        Mina_automation_fixture.Intf.Failed "output contains log"
-      else if not (String.is_prefix ~prefix:"j" hash) then
-        Failed "invalid ledger hash prefix"
-      else if Int.( <> ) (String.length hash) 52 then
-        Failed
-          (Printf.sprintf "invalid ledger hash length (%d)" (String.length hash))
-      else Passed )
+    let%map hash = Daemon.Client.ledger_hash client ~ledger_file in
+    if contain_log_output hash then
+      Mina_automation_fixture.Intf.Failed
+        (Error.of_string "output contains log")
+    else if not (String.is_prefix ~prefix:"j" hash) then
+      Failed (Error.of_string "invalid ledger hash prefix")
+    else if Int.( <> ) (String.length hash) 52 then
+      Failed
+        (Error.createf "invalid ledger hash length (%d)" (String.length hash))
+    else Passed
 end
 
 module LedgerCurrency = struct
@@ -92,17 +94,16 @@ module LedgerCurrency = struct
           Currency.Balance.to_nanomina_int account.balance )
       |> List.sum (module Int) ~f:Fn.id
     in
-    let%bind output = Daemon.Client.ledger_currency client ~ledger_file in
+    let%map output = Daemon.Client.ledger_currency client ~ledger_file in
     let actual = Scanf.sscanf output "MINA : %f" Fn.id in
     let total_currency_float = float_of_int total_currency /. 1000000000.0 in
 
-    Deferred.Or_error.return
-    @@
     if contain_log_output output then
-      Mina_automation_fixture.Intf.Failed "output contains log"
+      Mina_automation_fixture.Intf.Failed
+        (Error.of_string "output contains log")
     else if not Float.(abs (total_currency_float - actual) < 0.001) then
       Failed
-        (Printf.sprintf "invalid mina total count %f vs %f" total_currency_float
+        (Error.createf "invalid mina total count %f vs %f" total_currency_float
            actual )
     else Passed
 end
@@ -113,15 +114,14 @@ module AdvancedPrintSignatureKind = struct
   let test_case (test : t) =
     let daemon = Daemon.of_config test.config in
     let client = Daemon.client daemon in
-    let%bind output = Daemon.Client.advanced_print_signature_kind client in
+    let%map output = Daemon.Client.advanced_print_signature_kind client in
     let expected = "testnet" in
 
-    Deferred.Or_error.return
-    @@
     if contain_log_output output then
-      Mina_automation_fixture.Intf.Failed "output contains log"
+      Mina_automation_fixture.Intf.Failed
+        (Error.of_string "output contains log")
     else if not (String.equal expected (String.strip output)) then
-      Failed (Printf.sprintf "invalid signature kind %s vs %s" expected output)
+      Failed (Error.createf "invalid signature kind %s vs %s" expected output)
     else Passed
 end
 
@@ -137,15 +137,14 @@ module AdvancedCompileTimeConstants = struct
     in
     let temp_file = Filename.temp_file "commandline" "ledger.json" in
     Yojson.Safe.from_string config_content |> Yojson.Safe.to_file temp_file ;
-    let%bind output =
+    let%map output =
       Daemon.Client.advanced_compile_time_constants client
         ~config_file:temp_file
     in
 
-    Deferred.Or_error.return
-    @@
     if contain_log_output output then
-      Mina_automation_fixture.Intf.Failed "output contains log"
+      Mina_automation_fixture.Intf.Failed
+        (Error.of_string "output contains log")
     else Passed
 end
 
@@ -155,12 +154,11 @@ module AdvancedConstraintSystemDigests = struct
   let test_case (test : t) =
     let daemon = Daemon.of_config test.config in
     let client = Daemon.client daemon in
-    let%bind output = Daemon.Client.advanced_constraint_system_digests client in
+    let%map output = Daemon.Client.advanced_constraint_system_digests client in
 
-    Deferred.Or_error.return
-    @@
     if contain_log_output output then
-      Mina_automation_fixture.Intf.Failed "output contains log"
+      Mina_automation_fixture.Intf.Failed
+        (Error.of_string "output contains log")
     else Passed
 end
 

src/test/mina_automation/fixture/intf.ml

@@ -1,11 +1,12 @@
+open Core
 open Async
 
-type test_result = Passed | Failed of string | Warning of string
+type test_result = Passed | Failed of Error.t | Warning of string
 
 module type TestCase = sig
   type t
 
-  val test_case : t -> test_result Deferred.Or_error.t
+  val test_case : t -> test_result Deferred.t
 end
 
 module type Fixture = sig
@@ -24,7 +25,7 @@ module type Fixture = sig
   **)
   val setup : unit -> t Deferred.Or_error.t
 
-  val test_case : t -> test_result Deferred.Or_error.t
+  val test_case : t -> test_result Deferred.t
 
   val teardown : t -> unit Deferred.Or_error.t
 

src/test/mina_automation/runner/runner.ml

@@ -20,15 +20,17 @@ let run (module F : Intf.Fixture) =
       )
     (fun () ->
       match%bind F.test_case test_case_after_setup with
-      | Ok result ->
-          return result
-      | Error err ->
+      | Failed err ->
           let%map () = F.on_test_fail test_case_after_setup in
-          Intf.Failed (Error.to_string_hum err) )
+          Intf.Failed err
+      | result ->
+          return result )
 
 let run_blocking test_case () =
   match Async.Thread_safe.block_on_async_exn (fun () -> run test_case) with
   | Intf.Passed ->
       ()
-  | Warning msg | Failed msg ->
+  | Warning msg ->
       Alcotest.fail msg
+  | Failed err ->
+      Alcotest.fail (Error.to_string_hum err)