diff options
| author | Daniil Baturin <daniil@baturin.org> | 2016-12-13 08:05:48 +0600 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2016-12-13 08:05:48 +0600 |
| commit | d515e5be698397612630548652bf7c146da39d6d (patch) | |
| tree | 670b7c2fb3c5e6aeb54d9500060a22bfa243ad13 | |
| parent | 2b1083df2a7ceb87679c5d071bb9752c0ee7a352 (diff) | |
| download | vyconf-d515e5be698397612630548652bf7c146da39d6d.tar.gz vyconf-d515e5be698397612630548652bf7c146da39d6d.zip | |
Fix a few instances of sloppy sequences (with non-unit expressions).
| -rw-r--r-- | src/vyconfd.ml | 3 | ||||
| -rw-r--r-- | test/reference_tree_test.ml | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/vyconfd.ml b/src/vyconfd.ml index 3f80c1d..120990f 100644 --- a/src/vyconfd.ml +++ b/src/vyconfd.ml @@ -29,7 +29,8 @@ let load_config path = match result with | Result.Ok cfg -> cfg | Result.Error err -> - Lwt_log.fatal (Printf.sprintf "Could not load the configuration file %s" err); exit 1 + Lwt_log.fatal (Printf.sprintf "Could not load the configuration file %s" err) |> Lwt.ignore_result; + exit 1 let setup_logger daemonize log_file template = (* diff --git a/test/reference_tree_test.ml b/test/reference_tree_test.ml index 8c969ab..1e9a624 100644 --- a/test/reference_tree_test.ml +++ b/test/reference_tree_test.ml @@ -23,12 +23,12 @@ let test_validate_path_leaf_valid test_ctxt = let test_validate_path_leaf_invalid test_ctxt = let r = Vytree.make default_data "root" in let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in - assert_equal (raises_validation_error (fun () -> validate_path validators r ["system"; "host-name"; "1234"])) true + assert_equal (raises_validation_error (fun () -> ignore @@ validate_path validators r ["system"; "host-name"; "1234"])) true let test_validate_path_leaf_incomplete test_ctxt = let r = Vytree.make default_data "root" in let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in - assert_equal (raises_validation_error (fun () -> validate_path validators r ["system"; "host-name"])) true + assert_equal (raises_validation_error (fun () -> ignore @@ validate_path validators r ["system"; "host-name"])) true let test_validate_path_tag_node_complete_valid test_ctxt = let r = Vytree.make default_data "root" in @@ -39,13 +39,13 @@ let test_validate_path_tag_node_complete_valid test_ctxt = let test_validate_path_tag_node_invalid_name test_ctxt = let r = Vytree.make default_data "root" in let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in - assert_equal (raises_validation_error (fun () -> validate_path validators r ["system"; "login"; "user"; "999"; "full-name"; "test user"])) + assert_equal (raises_validation_error (fun () -> ignore @@ validate_path validators r ["system"; "login"; "user"; "999"; "full-name"; "test user"])) true let test_validate_path_tag_node_incomplete test_ctxt = let r = Vytree.make default_data "root" in let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in - assert_equal (raises_validation_error (fun () -> validate_path validators r ["system"; "login"; "user"])) true + assert_equal (raises_validation_error (fun () -> ignore @@ validate_path validators r ["system"; "login"; "user"])) true let suite = |