Add case for incomplete/syntax-error when parsing conf file. Addresses …

…#153
basho · Sep 5, 2014 · 36d1d11 · 36d1d11 · borshop · Oct 17, 2014
1 parent b2ce0b1
commit 36d1d11
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/cuttlefish_conf.erl b/src/cuttlefish_conf.erl
@@ -66,6 +66,8 @@ file(Filename) ->
     case conf_parse:file(Filename) of
         {error, Reason} ->
             {error, [{error, ?FMT("Could not open file (~s) for Reason ~s", [Filename, Reason])}]};
+        {_Conf, Remainder, {{line, L}, {column, C}}} when is_binary(Remainder) ->
+            {error, [{error, ?FMT("Syntax error in ~s after line ~p column ~p, parsing incomplete", [Filename, L, C])}]};
         Conf ->
             %% Conf is a proplist, check if any of the values are cuttlefish_errors
             {_, Values} = lists:unzip(Conf),
@@ -273,6 +275,11 @@ files_one_nonent_test() ->
     ?assertEqual({error,[{error,"Could not open file (../test/nonent.conf) for Reason enoent"}]}, Conf),
     ok.
 
+files_incomplete_parse_test() ->
+    Conf = file("../test/incomplete.conf"),
+    ?assertEqual({error, [{error,"Syntax error in ../test/incomplete.conf after line 3 column 1, parsing incomplete"}]}, Conf),
+    ok.
+
 generate_element_level_advanced_test() ->
     cuttlefish_lager_test_backend:bounce(warning),
     assert_no_output({level, advanced}),

diff --git a/test/incomplete.conf b/test/incomplete.conf
@@ -0,0 +1,3 @@
+a.b = c
+c.d = e
+f =