diff options
| author | Lukas Larsson <[email protected]> | 2019-01-15 16:53:54 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-01-15 16:53:54 +0100 |
| commit | 1319199c3c2603b627703a031daeab71c8c5c286 (patch) | |
| tree | b57f9996b8d14be778a8e9ea9df94f10568f12e1 /lib/inets | |
| parent | f06748963003692e003beb31f20ee820cf24364b (diff) | |
| parent | 840eea40305ffc323572b39cc139ffaf7cf2ade6 (diff) | |
| download | otp-1319199c3c2603b627703a031daeab71c8c5c286.tar.gz otp-1319199c3c2603b627703a031daeab71c8c5c286.tar.bz2 otp-1319199c3c2603b627703a031daeab71c8c5c286.zip | |
Merge branch 'lukas/ssl/benchmark_basic_test'
* lukas/ssl/benchmark_basic_test:
inets: Decrease benchmark TC timeout
inets: Fix crypto:rand_bytes usage in benchmarks
ssl: Only run a basic fast test in test cycle
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/test/httpd_bench_SUITE.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/inets/test/httpd_bench_SUITE.erl b/lib/inets/test/httpd_bench_SUITE.erl index 4b549dcb5b..087516f56c 100644 --- a/lib/inets/test/httpd_bench_SUITE.erl +++ b/lib/inets/test/httpd_bench_SUITE.erl @@ -37,7 +37,8 @@ %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- suite() -> - [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}]. + [{timetrap, {minutes, 1}}, + {ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}]. all() -> [ @@ -499,8 +500,8 @@ start_dummy("http"= Protocol, Config) -> Conf = [ %%{big, filename:join(DataDir, "1M_file")}, %%{small, filename:join(DataDir, "1k_file")}, - {big, {gen, crypto:rand_bytes(1000000)}}, - {small, {gen, crypto:rand_bytes(1000)}}, + {big, {gen, crypto:strong_rand_bytes(1000000)}}, + {small, {gen, crypto:strong_rand_bytes(1000)}}, {http_version, HTTPVersion}, {keep_alive, ?config(keep_alive, Config)} ], @@ -519,8 +520,8 @@ start_dummy("https" = Protocol, Config) -> Opts = [{active, true}, {nodelay, true}, {reuseaddr, true} | SSLOpts], Conf = [%%{big, filename:join(DataDir, "1M_file")}, %%{small, filename:join(DataDir, "1k_file")}, - {big, {gen, crypto:rand_bytes(1000000)}}, - {small, {gen, crypto:rand_bytes(1000)}}, + {big, {gen, crypto:strong_rand_bytes(1000000)}}, + {small, {gen, crypto:strong_rand_bytes(1000)}}, {http_version, HTTPVersion}, {keep_alive, ?config(keep_alive, Config)} ], |