diff options
author | Hans Nilsson <[email protected]> | 2016-12-01 13:33:15 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2016-12-14 11:46:46 +0100 |
commit | 7300d01bedaed1fbb213378d43589b4448aa5d3b (patch) | |
tree | e6c43acb5f6d6f2336e77eaf68584c31f4072b7b | |
parent | a8ea98ef814022dc02a1917105a0572007952e52 (diff) | |
download | otp-7300d01bedaed1fbb213378d43589b4448aa5d3b.tar.gz otp-7300d01bedaed1fbb213378d43589b4448aa5d3b.tar.bz2 otp-7300d01bedaed1fbb213378d43589b4448aa5d3b.zip |
ssh: [test] Move fn random_chars/1 to ssh_test_lib
-rw-r--r-- | lib/ssh/test/ssh_sftp_SUITE.erl | 4 | ||||
-rw-r--r-- | lib/ssh/test/ssh_test_lib.erl | 5 | ||||
-rw-r--r-- | lib/ssh/test/ssh_upgrade_SUITE.erl | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl index 70662f5d93..acf76157a2 100644 --- a/lib/ssh/test/ssh_sftp_SUITE.erl +++ b/lib/ssh/test/ssh_sftp_SUITE.erl @@ -1038,7 +1038,7 @@ oldprep(Config) -> prepare(Config0) -> PrivDir = proplists:get_value(priv_dir, Config0), - Dir = filename:join(PrivDir, random_chars(10)), + Dir = filename:join(PrivDir, ssh_test_lib:random_chars(10)), file:make_dir(Dir), Keys = [filename, testfile, @@ -1058,8 +1058,6 @@ prepare(Config0) -> [{sftp_priv_dir,Dir} | Config2]. -random_chars(N) -> [crypto:rand_uniform($a,$z) || _<-lists:duplicate(N,x)]. - foldl_keydelete(Keys, L) -> lists:foldl(fun(K,E) -> lists:keydelete(K,1,E) end, L, diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl index 1154f18991..27fc9ed6ad 100644 --- a/lib/ssh/test/ssh_test_lib.erl +++ b/lib/ssh/test/ssh_test_lib.erl @@ -842,3 +842,8 @@ get_kex_init(Conn, Ref, TRef) -> end end. +%%%---------------------------------------------------------------- +%%% Return a string with N random characters +%%% +random_chars(N) -> [crypto:rand_uniform($a,$z) || _<-lists:duplicate(N,x)]. + diff --git a/lib/ssh/test/ssh_upgrade_SUITE.erl b/lib/ssh/test/ssh_upgrade_SUITE.erl index b5b27c369a..7b9b109fa1 100644 --- a/lib/ssh/test/ssh_upgrade_SUITE.erl +++ b/lib/ssh/test/ssh_upgrade_SUITE.erl @@ -199,6 +199,4 @@ close(#state{server = Server, connection = undefined}. -random_contents() -> list_to_binary( random_chars(3) ). - -random_chars(N) -> [crypto:rand_uniform($a,$z) || _<-lists:duplicate(N,x)]. +random_contents() -> list_to_binary( ssh_test_lib:random_chars(3) ). |