diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-06-18 20:32:20 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-06-18 20:32:20 -0400 |
| commit | 4edfed60a201921995cea987494839eeb6b75638 (patch) | |
| tree | b3fe314a52d1568a45e8014c72614f5e6b563acd /test | |
| parent | 544cf2ced3db9b179e9adeade76d0345611ba703 (diff) | |
| parent | cd8c03e1c481b0ac7a6372d586411bcf9dd6a354 (diff) | |
Merge pull request #517 from tsloughter/dict_parse
catch error if config can't be parsed into dict to print error message
Diffstat (limited to 'test')
| -rw-r--r-- | test/rebar_deps_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/rebar_test_utils.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/rebar_deps_SUITE.erl b/test/rebar_deps_SUITE.erl index 6b902a5..afd487e 100644 --- a/test/rebar_deps_SUITE.erl +++ b/test/rebar_deps_SUITE.erl @@ -215,7 +215,7 @@ newly_added_dep(Config) -> {ok, RebarConfig2} = file:consult(rebar_test_utils:create_config(AppDir, [{deps, TopDeps2}])), LockFile = filename:join(AppDir, "rebar.lock"), RebarConfig3 = rebar_config:merge_locks(RebarConfig2, - rebar_config:consult_file(LockFile)), + rebar_config:consult_lock_file(LockFile)), %% a should now be installed and c should not change rebar_test_utils:run_and_check( diff --git a/test/rebar_test_utils.erl b/test/rebar_test_utils.erl index f53ba20..9c181d8 100644 --- a/test/rebar_test_utils.erl +++ b/test/rebar_test_utils.erl @@ -164,7 +164,7 @@ check_results(AppDir, Expected) -> GlobalPluginDirs = filelib:wildcard(filename:join([AppDir, "global", "plugins"])), CheckoutsDir = filename:join([AppDir, "_checkouts"]), LockFile = filename:join([AppDir, "rebar.lock"]), - Locks = lists:flatten(rebar_config:consult_file(LockFile)), + Locks = lists:flatten(rebar_config:consult_lock_file(LockFile)), InvalidApps = rebar_app_discover:find_apps(BuildDirs, invalid), ValidApps = rebar_app_discover:find_apps(BuildDirs, valid), |