From 19ae6a4c98a131aab84ed9922c307ab3f0eebec7 Mon Sep 17 00:00:00 2001 From: Luke Bakken Date: Mon, 30 Oct 2017 10:44:27 -0700 Subject: Add test that demonstrates that fixes preserve an argument that contains both double quotes and a space character --- test/rlx_extended_bin_SUITE.erl | 47 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/rlx_extended_bin_SUITE.erl b/test/rlx_extended_bin_SUITE.erl index 4407cfc..fb95bab 100644 --- a/test/rlx_extended_bin_SUITE.erl +++ b/test/rlx_extended_bin_SUITE.erl @@ -23,6 +23,7 @@ init_per_testcase/2, all/0, start_sname_in_other_argsfile/1, + start_preserves_arguments/1, start_fail_when_no_name/1, start_fail_when_multiple_names/1, start_fail_when_missing_argsfile/1, @@ -75,7 +76,8 @@ init_per_testcase(_, Config) -> {state, State1} | Config]. all() -> - [start_sname_in_other_argsfile, start_fail_when_no_name, start_fail_when_multiple_names, + [start_sname_in_other_argsfile, start_preserves_arguments, + 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, ping, shortname_ping, longname_ping, attach, pid, restart, reboot, escript, @@ -1440,6 +1442,49 @@ start_sname_in_other_argsfile(Config) -> %% a ping should fail after stopping a node {error, 1, _} = sh(filename:join([OutputDir, "foo", "bin", "foo ping"])). +start_preserves_arguments(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} + ]), + + PrivDir = proplists:get_value(priv_dir, Config), + OutputDir = filename:join([PrivDir, 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 + %% and preserving the "tricky" argument that contains a string with a space + %% in it + {ok, _} = sh(filename:join([OutputDir, "foo", "bin", "foo start -goal_app baz '\"bat zing\"'"])), + timer:sleep(2000), + BinFile = filename:join([PrivDir, "goal_app.bin"]), + Eval = io_lib:format("{ok,Env}=application:get_env(goal_app,baz),file:write_file(\"~s\",term_to_binary(Env)).", + [BinFile]), + Cmd = lists:flatten(io_lib:format("foo eval '~s'", [Eval])), + {ok, _} = sh(filename:join([OutputDir, "foo", "bin", Cmd])), + {ok, Bin} = file:read_file(BinFile), + "bat zing" = binary_to_term(Bin), + file:delete(BinFile), + {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"]), -- cgit v1.2.3