diff options
author | Luis Rascão <[email protected]> | 2018-02-15 16:56:26 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2018-02-15 16:56:26 +0000 |
commit | 86d415f33c500d432d6c9fa2fcbff3bb2fff3e8f (patch) | |
tree | 2cbd5d32ad9db7f107f0289b283bab425ff3ce25 /test/rlx_extended_bin_SUITE.erl | |
parent | af3ae8a64f92054ce474f5d67bdd467d3ca8d74e (diff) | |
parent | 310b7047a2dba4d4ed6ef8ef52a96456073e0c16 (diff) | |
download | relx-86d415f33c500d432d6c9fa2fcbff3bb2fff3e8f.tar.gz relx-86d415f33c500d432d6c9fa2fcbff3bb2fff3e8f.tar.bz2 relx-86d415f33c500d432d6c9fa2fcbff3bb2fff3e8f.zip |
Merge pull request #640 from juise/masterv3.24.5
Add extra args from vm.args into escripts and erl
Diffstat (limited to 'test/rlx_extended_bin_SUITE.erl')
-rw-r--r-- | test/rlx_extended_bin_SUITE.erl | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl index d2bf753..1177ede 100644 --- a/test/rlx_extended_bin_SUITE.erl +++ b/test/rlx_extended_bin_SUITE.erl @@ -24,6 +24,7 @@ all/0, start_sname_in_other_argsfile/1, start_preserves_arguments/1, + start_nodetool_with_data_from_argsfile/1, start_fail_when_no_name/1, start_fail_when_multiple_names/1, start_fail_when_missing_argsfile/1, @@ -78,7 +79,7 @@ init_per_testcase(_, Config) -> {state, State1} | Config]. all() -> - [start_sname_in_other_argsfile, start_preserves_arguments, + [start_sname_in_other_argsfile, start_preserves_arguments, start_nodetool_with_data_from_argsfile, start_fail_when_no_name, start_fail_when_multiple_names, start_fail_when_missing_argsfile, start_fail_when_nonreadable_argsfile, start_fail_when_relative_argsfile, start_fail_when_circular_argsfiles, @@ -94,7 +95,6 @@ all() -> ping(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"]), @@ -1490,6 +1490,46 @@ start_preserves_arguments(Config) -> %% a ping should fail after stopping a node {error, 1, _} = sh(filename:join([OutputDir, "foo", "bin", "foo ping"])). +start_nodetool_with_data_from_argsfile(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"]), + VmArgs = filename:join([LibDir1, "vm.args"]), + + rlx_test_utils:write_config(ConfigFile, + [{release, {foo, "0.0.1"}, + [goal_app]}, + {lib_dirs, [filename:join(LibDir1, "*")]}, + {vm_args, VmArgs}, + {generate_start_script, true}, + {extended_start_script, true} + ]), + + ec_file:write(VmArgs, "-setcookie cookie\n" + "-sname foo\n\n" + "-proto_dist inet_tcp\n\n"), + + 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"]), + + %% now start/stop the release to make sure the extended script is working + {ok, _} = sh(filename:join([OutputDir, "foo", "bin", "foo start"])), + timer:sleep(2000), + {ok, "pong"} = sh(filename:join([OutputDir, "foo", "bin", "foo ping"])), + {ok, _} = sh(filename:join([OutputDir, "foo", "bin", "foo stop"])), + %% a ping should fail after stopping a node + {error, 1, _} = sh(filename:join([OutputDir, "foo", "bin", "foo ping"])). + start_fail_when_no_name(Config) -> LibDir1 = proplists:get_value(lib1, Config), VmArgs = filename:join([LibDir1, "vm.args"]), |