diff options
| author | Hans Bolinder <[email protected]> | 2013-03-19 09:45:02 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2013-03-19 09:45:02 +0100 |
| commit | ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0 (patch) | |
| tree | ab2a7f0f5f64e13a4148e11bcd0b6772ad2668a5 /lib/stdlib/test/shell_SUITE.erl | |
| parent | 4ac5deb44293aa78ee53dae0e190733442a2c6c6 (diff) | |
| parent | 4aca384fb03e29b4494831041de515362ed1af77 (diff) | |
| download | otp-ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0.tar.gz otp-ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0.tar.bz2 otp-ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0.zip | |
Merge branch 'hb/test_case_corrections' into maint
* hb/test_case_corrections:
Fix a test case
Fix a test case
Fix a test case bug
Fix a test case bug
Remove ?line from dets_SUITE.erl
Adjust dets.erl to cope with an evil test case
Correct a disk_log testcase
Diffstat (limited to 'lib/stdlib/test/shell_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/shell_SUITE.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl index 990b1f5eb2..681c154463 100644 --- a/lib/stdlib/test/shell_SUITE.erl +++ b/lib/stdlib/test/shell_SUITE.erl @@ -122,7 +122,7 @@ start_restricted_from_shell(Config) when is_list(Config) -> "test_restricted.erl"), Contents = <<"-module(test_restricted). -export([local_allowed/3, non_local_allowed/3]). - local_allowed(i,[],State) -> + local_allowed(m,[],State) -> {true,State}; local_allowed(ugly,[],_State) -> non_conforming_reply; @@ -146,7 +146,7 @@ start_restricted_from_shell(Config) when is_list(Config) -> "test_restricted) end.">>), ?line {ok, test_restricted} = application:get_env(stdlib, restricted_shell), - ?line "Pid" ++ _ = t(<<"begin i() end.">>), + ?line "Module" ++ _ = t(<<"begin m() end.">>), ?line "exception exit: restricted shell does not allow c(foo)" = comm_err(<<"begin c(foo) end.">>), ?line "exception exit: restricted shell does not allow init:stop()" = @@ -199,9 +199,9 @@ start_restricted_on_command_line(Config) when is_list(Config) -> "-pa "++?config(priv_dir,Config)++ " -stdlib restricted_shell foo"), ?line "Warning! Restricted shell module foo not found: nofile"++_ = - t({Node, <<"begin i() end.">>}), - ?line "exception exit: restricted shell does not allow i()" = - comm_err({Node, <<"begin i() end.">>}), + t({Node, <<"begin m() end.">>}), + ?line "exception exit: restricted shell does not allow m()" = + comm_err({Node, <<"begin m() end.">>}), ?line [ok] = (catch scan({Node, <<"begin q() end.">>})), ?line test_server:stop_node(Node), @@ -209,7 +209,7 @@ start_restricted_on_command_line(Config) when is_list(Config) -> "test_restricted2.erl"), Contents = <<"-module(test_restricted2). -export([local_allowed/3, non_local_allowed/3]). - local_allowed(i,[],State) -> + local_allowed(m,[],State) -> {true,State}; local_allowed(_,_,State) -> {false,State}. @@ -225,7 +225,7 @@ start_restricted_on_command_line(Config) when is_list(Config) -> ?line {ok,Node2} = start_node(shell_suite_helper_2, "-pa "++?config(priv_dir,Config)++ " -stdlib restricted_shell test_restricted2"), - ?line "Pid" ++ _ = t({Node2,<<"begin i() end.">>}), + ?line "Module" ++ _ = t({Node2,<<"begin m() end.">>}), ?line "exception exit: restricted shell does not allow c(foo)" = comm_err({Node2,<<"begin c(foo) end.">>}), ?line "exception exit: restricted shell does not allow init:stop()" = @@ -254,7 +254,7 @@ restricted_local(Config) when is_list(Config) -> "test_restricted_local.erl"), Contents = <<"-module(test_restricted_local). -export([local_allowed/3, non_local_allowed/3]). - local_allowed(i,[],State) -> + local_allowed(m,[],State) -> {true,State}; local_allowed(banan,_,State) -> {true,State}; |