diff options
| author | Peter Andersson <[email protected]> | 2016-06-14 09:37:10 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2016-06-14 09:37:10 +0200 |
| commit | d08201b22997975bccae635bf47ddec6b585c5a8 (patch) | |
| tree | 6ba20967fae50fc920f2ab2c48ad8ac61b464cbf /lib/common_test/test | |
| parent | a1d506d8bf8978656d76bff884adc329d2f4da3b (diff) | |
| parent | e3fd5673dfb8542fe34ec490c4c788c21b20ef69 (diff) | |
| download | otp-d08201b22997975bccae635bf47ddec6b585c5a8.tar.gz otp-d08201b22997975bccae635bf47ddec6b585c5a8.tar.bz2 otp-d08201b22997975bccae635bf47ddec6b585c5a8.zip | |
Merge branch 'peppe/common_test/OTP-13615'
* peppe/common_test/OTP-13615:
Fix problem with incorrect type of timestamps
OTP-13615
Diffstat (limited to 'lib/common_test/test')
| -rw-r--r-- | lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl index 7b9b5687e5..bd1ac54781 100644 --- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl +++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl @@ -40,6 +40,7 @@ suite() -> %% @end %%-------------------------------------------------------------------- init_per_suite(Config) -> + application:start(sasl), Gen = spawn(fun() -> gen() end), [{gen,Gen}|Config]. @@ -52,6 +53,7 @@ end_per_suite(Config) -> Gen = proplists:get_value(gen, Config), exit(Gen, kill), ct:sleep(100), + application:stop(sasl), ok. %%-------------------------------------------------------------------- @@ -90,7 +92,8 @@ end_per_testcase(_TestCase, _Config) -> %% @end %%-------------------------------------------------------------------- groups() -> - [{g1,[parallel,{repeat,10}],[tc1,tc2,tc3]}]. + [{g1,[parallel,{repeat,10}],[tc1,tc2,tc3]}, + {g2,[{repeat,10}],[tc1,tc2,tc3]}]. %%-------------------------------------------------------------------- %% @spec all() -> GroupsAndTestCases | {skip,Reason} @@ -101,7 +104,7 @@ groups() -> %% @end %%-------------------------------------------------------------------- all() -> - [{group,g1}]. + [{group,g1},{group,g2}]. tc1(_) -> ct:sleep(100), @@ -121,5 +124,6 @@ gen() -> gen_loop(N) -> ct:log("Logger iteration: ~p", [N]), error_logger:error_report(N), - ct:sleep(200), + error_logger:info_report(progress, N), + ct:sleep(150), gen_loop(N+1). |