diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/rlx_archive_SUITE.erl | 2 | ||||
-rw-r--r-- | test/rlx_command_SUITE.erl | 2 | ||||
-rw-r--r-- | test/rlx_discover_SUITE.erl | 2 | ||||
-rw-r--r-- | test/rlx_eunit_SUITE.erl | 2 | ||||
-rw-r--r-- | test/rlx_extended_bin_SUITE.erl | 45 | ||||
-rw-r--r-- | test/rlx_release_SUITE.erl | 88 | ||||
-rw-r--r-- | test/rlx_test_utils.erl | 4 |
7 files changed, 134 insertions, 11 deletions
diff --git a/test/rlx_archive_SUITE.erl b/test/rlx_archive_SUITE.erl index 8d30915..705950f 100644 --- a/test/rlx_archive_SUITE.erl +++ b/test/rlx_archive_SUITE.erl @@ -18,7 +18,7 @@ -include_lib("kernel/include/file.hrl"). suite() -> - [{timetrap, {seconds, 120}}]. + []. init_per_suite(Config) -> Config. diff --git a/test/rlx_command_SUITE.erl b/test/rlx_command_SUITE.erl index 8dd2da8..916bdf7 100644 --- a/test/rlx_command_SUITE.erl +++ b/test/rlx_command_SUITE.erl @@ -34,7 +34,7 @@ -include_lib("eunit/include/eunit.hrl"). suite() -> - [{timetrap,{seconds,120}}]. + []. init_per_suite(Config) -> Config. diff --git a/test/rlx_discover_SUITE.erl b/test/rlx_discover_SUITE.erl index 9385229..fc81bc2 100644 --- a/test/rlx_discover_SUITE.erl +++ b/test/rlx_discover_SUITE.erl @@ -34,7 +34,7 @@ -include_lib("eunit/include/eunit.hrl"). suite() -> - [{timetrap,{seconds,120}}]. + []. init_per_suite(Config) -> Config. diff --git a/test/rlx_eunit_SUITE.erl b/test/rlx_eunit_SUITE.erl index c7c0751..780e409 100644 --- a/test/rlx_eunit_SUITE.erl +++ b/test/rlx_eunit_SUITE.erl @@ -30,7 +30,7 @@ -include_lib("eunit/include/eunit.hrl"). suite() -> - [{timetrap,{seconds,120}}]. + []. init_per_suite(Config) -> Config. diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl index 710d2c4..c43e8a6 100644 --- a/test/rlx_extended_bin_SUITE.erl +++ b/test/rlx_extended_bin_SUITE.erl @@ -40,6 +40,7 @@ restart/1, reboot/1, escript/1, + os_var_timeouts/1, remote_console/1, shortname_remote_console/1, replace_os_vars/1, replace_os_vars_sys_config_vm_args_src/1, @@ -66,7 +67,7 @@ -define(SLEEP_TIME, 2500). suite() -> - [{timetrap,{seconds,300}}]. + []. init_per_suite(Config) -> Config. @@ -392,6 +393,48 @@ escript(Config) -> {ok, Output} = sh(filename:join([OutputDir, "foo", "bin", "foo escript script.erl"])), ?assertEqual(ExpectedOutput, Output). +os_var_timeouts(Config) -> + LibDir1 = proplists:get_value(lib1, Config), + + rlx_test_utils:create_app(LibDir1, "goal_app", "0.0.1", [stdlib,kernel], []), + + ConfigFile = filename:join([LibDir1, "relx.config"]), + rlx_test_utils:write_config(ConfigFile, + [{release, {foo, "0.0.1"}, + [goal_app]}, + {lib_dirs, [filename:join(LibDir1, "*")]}, + {generate_start_script, true}, + {extended_start_script, true} + ]), + + OutputDir = filename:join([proplists:get_value(priv_dir, Config), + rlx_test_utils:create_random_name("relx-output")]), + + {ok, _State} = relx:do([{relname, foo}, + {relvsn, "0.0.1"}, + {goals, []}, + {lib_dirs, [LibDir1]}, + {log_level, 3}, + {output_dir, OutputDir}, + {config, ConfigFile}], ["release"]), + + ok = ec_file:write(filename:join([OutputDir, "foo", "script.erl"]), + [rlx_test_utils:escript_contents()]), + + %% now start/stop the release to make sure the extended script is working + {ok, _} = sh(filename:join([OutputDir, "foo", "bin", "foo start"])), + timer:sleep(?SLEEP_TIME), + ?assertEqual({ok, "ok"}, sh(filename:join([OutputDir, "foo", "bin", + "foo rpcterms timer sleep 2000."]))), + ?assertEqual({ok, "ok"}, sh(filename:join([OutputDir, "foo", "bin", + "foo rpcterms timer sleep 2000."]), + [{"NODETOOL_TIMEOUT", "5asdnkajef"}])), + {error,1,"RPC to " ++ _Rest} = sh(filename:join([OutputDir, "foo", "bin", + "foo rpcterms timer sleep 2000."]), + [{"NODETOOL_TIMEOUT", "500"}]). + + + remote_console(Config) -> LibDir1 = proplists:get_value(lib1, Config), diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index a582526..a2aab71 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -31,6 +31,7 @@ make_release/1, make_config_release/1, make_extend_release/1, + make_extend_release_versioned/1, make_extend_config_release/1, make_scriptless_release/1, make_overridden_release/1, @@ -67,7 +68,7 @@ -include_lib("kernel/include/file.hrl"). suite() -> - [{timetrap,{seconds,120}}]. + []. init_per_suite(Config) -> Config. @@ -87,6 +88,7 @@ init_per_testcase(_, Config) -> all() -> [providers, providers_via_api_options, add_providers, add_providers_via_api_options, make_release, make_config_release, make_extend_release, make_extend_config_release, + make_extend_release_versioned, make_scriptless_release, make_overridden_release, make_auto_skip_empty_app_release, make_skip_app_release, make_exclude_app_release, make_app_type_none_release, make_implicit_config_release, make_rerun_overridden_release, overlay_release, @@ -380,6 +382,41 @@ make_extend_release(Config) -> ?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)), ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)). +make_extend_release_versioned(Config) -> + LibDir1 = proplists:get_value(lib1, Config), + + rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []), + rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []), + rlx_test_utils:create_app(LibDir1, "goal_app_2", "0.0.1", [stdlib,kernel,goal_app_1,non_goal_2], []), + rlx_test_utils:create_app(LibDir1, "non_goal_1", "0.0.1", [stdlib,kernel], [lib_dep_1]), + rlx_test_utils:create_app(LibDir1, "non_goal_2", "0.0.1", [stdlib,kernel], []), + + ConfigFile = filename:join([LibDir1, "relx.config"]), + rlx_test_utils:write_config(ConfigFile, + [{release, {foo, "0.0.2"}, + [goal_app_1, + goal_app_2]}, + {release, {foo_test, "0.0.3", {extend, {foo, "0.0.2"}}}, + [goal_app_2]}, + {lib_dirs, [filename:join(LibDir1, "*")]}]), + OutputDir = filename:join([proplists:get_value(priv_dir, Config), + rlx_test_utils:create_random_name("relx-output")]), + + ?assertMatch({error, {rlx_prv_release, {multiple_release_names,foo,foo_test}}}, + catch relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, ConfigFile)), + + {ok, State} = relx:do(foo_test, undefined, [], [LibDir1], 3, + OutputDir, ConfigFile), + [{{foo_test, "0.0.3"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), + AppSpecs = rlx_release:applications(Release), + ?assert(lists:keymember(stdlib, 1, AppSpecs)), + ?assert(lists:keymember(kernel, 1, AppSpecs)), + ?assert(lists:member({non_goal_1, "0.0.1"}, AppSpecs)), + ?assert(lists:member({non_goal_2, "0.0.1"}, AppSpecs)), + ?assert(lists:member({goal_app_1, "0.0.1"}, AppSpecs)), + ?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)), + ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)). + make_extend_config_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), @@ -781,14 +818,20 @@ overlay_release(Config) -> goal_app_2]}]), VarsFile1 = filename:join([LibDir1, "vars1.config"]), + %% `tpl_var' is defined in vars1, but redifined in vars2 using template. + %% `api_caller_var' is to be injected as an API caller overlay var. rlx_test_utils:write_config(VarsFile1, [{yahoo, "yahoo"}, {yahoo2, [{foo, "bar"}]}, {foo_yahoo, "foo_{{yahoo}}"}, - {foo_dir, "foodir"}]), + {foo_dir, "foodir"}, + {tpl_var, "defined in vars1"}, + {api_caller_var, "{{api_caller_var}}"}]), VarsFile2 = filename:join([LibDir1, "vars2.config"]), rlx_test_utils:write_config(VarsFile2, [{google, "yahoo"}, {yahoo2, "foo"}, + {tpl_arg, "a template value"}, + {tpl_var, "Redefined in vars2 with {{tpl_arg}}"}, OverlayVars3]), VarsFile3 = filename:join([LibDir1, "vars3.config"]), @@ -810,8 +853,25 @@ overlay_release(Config) -> OutputDir = filename:join([proplists:get_value(priv_dir, Config), rlx_test_utils:create_random_name("relx-output")]), - {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 3, - OutputDir, ConfigFile), + ApiCallerVarValue = "api-caller-var", + ApiCallerReleaseNameValue = "release-var-conflict", + ApiCallerConfigFileValue = "state-var-conflict", + ApiCallerYahooValue = "overlays-file-conflict", + ApiCallerOverlays = + [{api_caller_var, ApiCallerVarValue}, + {release_name, ApiCallerReleaseNameValue}, + {config_file, ApiCallerConfigFileValue}, + {yahoo, ApiCallerYahooValue}], + + {ok, State} = relx:do([{relname, undefined}, + {relvsn, undefined}, + {goals, []}, + {lib_dirs, [LibDir1]}, + {log_level, 3}, + {output_dir, OutputDir}, + {config, ConfigFile}, + {api_caller_overlays, ApiCallerOverlays}], + ["release"]), [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), AppSpecs = rlx_release:applications(Release), @@ -848,6 +908,8 @@ overlay_release(Config) -> proplists:get_value(release_version, TemplateData)), ?assertEqual(foo, proplists:get_value(release_name, TemplateData)), + ?assertMatch(ConfigFile, + proplists:get_value(config_file, TemplateData)), ?assertEqual("yahoo/foo4", proplists:get_value(yahoo4, TemplateData)), ?assertEqual("foo_yahoo", @@ -857,7 +919,23 @@ overlay_release(Config) -> ?assertEqual("val1", proplists:get_value(prop1, TemplateData)), ?assertEqual(2, - proplists:get_value(prop2, TemplateData)). + proplists:get_value(prop2, TemplateData)), + %% This should be rendered correctly based on VarsFile2 file, regardless + %% of tpl_var defined in VarsFile1 or not. + ?assertEqual("Redefined in vars2 with a template value", + proplists:get_value(tpl_var, TemplateData)), + + ?assertEqual(ApiCallerVarValue, + proplists:get_value(api_caller_var, TemplateData)), + % The following complements a few of the assertions above + % by ensuring that the values of the overwritten API caller + % overlays were distinct from their internal values. + ?assertNotEqual(ApiCallerReleaseNameValue, + proplists:get_value(release_name, TemplateData)), + ?assertNotEqual(ApiCallerConfigFileValue, + proplists:get_value(config_file, TemplateData)), + ?assertNotEqual(ApiCallerYahooValue, + proplists:get_value(yahoo, TemplateData)). make_goalless_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), diff --git a/test/rlx_test_utils.erl b/test/rlx_test_utils.erl index 37d9c7a..2c5f7af 100644 --- a/test/rlx_test_utils.erl +++ b/test/rlx_test_utils.erl @@ -185,7 +185,9 @@ test_template_contents() -> "{foo_yahoo, \"{{foo_yahoo}}\"}.\n" "{google, \"{{google}}\"}.\n" "{prop1, \"{{prop1}}\"}.\n" - "{prop2, {{prop2}}}.\n". + "{prop2, {{prop2}}}.\n" + "{tpl_var, \"{{tpl_var}}\"}.\n" + "{api_caller_var, \"{{api_caller_var}}\"}.\n". escript_contents() -> "#!/usr/bin/env escript\n" |