diff options
| author | Dan Gudmundsson <[email protected]> | 2016-04-22 09:28:01 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-04-22 09:28:01 +0200 |
| commit | 2b0ecf4f702f720ea0861f94a833bd11b22c34d5 (patch) | |
| tree | ef50df50623c868b9dda9e0816bd4275c3bbdcfb /lib/mnesia/test | |
| parent | 9b099a4b7a7a095aec04fe7fa02d97aa005c9323 (diff) | |
| parent | 6d1f0b6ac13e2a8615a1d92238892196daa4ee4e (diff) | |
| download | otp-2b0ecf4f702f720ea0861f94a833bd11b22c34d5.tar.gz otp-2b0ecf4f702f720ea0861f94a833bd11b22c34d5.tar.bz2 otp-2b0ecf4f702f720ea0861f94a833bd11b22c34d5.zip | |
Merge branch 'dgud/test-cuddle'
* dgud/test-cuddle:
Windows: Skip tests that requires admin privileges
observer: add debug info to ttb_SUITE
mnesia: add debug printouts
Diffstat (limited to 'lib/mnesia/test')
| -rw-r--r-- | lib/mnesia/test/mnesia_config_test.erl | 8 | ||||
| -rw-r--r-- | lib/mnesia/test/mnesia_consistency_test.erl | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/mnesia/test/mnesia_config_test.erl b/lib/mnesia/test/mnesia_config_test.erl index a31c9b1f4f..204b8fa394 100644 --- a/lib/mnesia/test/mnesia_config_test.erl +++ b/lib/mnesia/test/mnesia_config_test.erl @@ -693,9 +693,9 @@ event_module(Config) when is_list(Config) -> end, ?match({[ok, ok], []}, rpc:multicall(Nodes, mnesia, start, [Def])), - receive after 1000 -> ok end, + receive after 2000 -> ok end, mnesia_event ! {get_log, self()}, - DebugLog1 = receive + DebugLog1 = receive {log, L1} -> L1 after 10000 -> [timeout] end, @@ -706,9 +706,9 @@ event_module(Config) when is_list(Config) -> ?match({[ok], []}, rpc:multicall([N2], mnesia, start, [])), - receive after 1000 -> ok end, + receive after 2000 -> ok end, mnesia_event ! {get_log, self()}, - DebugLog = receive + DebugLog = receive {log, L} -> L after 10000 -> [timeout] end, diff --git a/lib/mnesia/test/mnesia_consistency_test.erl b/lib/mnesia/test/mnesia_consistency_test.erl index 6c3e68ba38..9cc84de87b 100644 --- a/lib/mnesia/test/mnesia_consistency_test.erl +++ b/lib/mnesia/test/mnesia_consistency_test.erl @@ -565,6 +565,7 @@ consistency_after_fallback_3_disc_only(Config) when is_list(Config) -> consistency_after_fallback(disc_only_copies, 3, Config). consistency_after_fallback(ReplicaType, NodeConfig, Config) -> + put(mnesia_test_verbose, true), %%?verbose("Starting consistency_after_fallback2 at ~p~n", [self()]), Delay = 5, Nodes = ?acquire_nodes(NodeConfig, [{tc_timeout, timer:minutes(10)} | Config]), @@ -594,10 +595,11 @@ consistency_after_fallback(ReplicaType, NodeConfig, Config) -> ?match(ok, mnesia_tpcb:verify_tabs()), %% Stop and then start mnesia and check table consistency - %%?verbose("Restarting Mnesia~n", []), + ?verbose("Kill Mnesia~n", []), mnesia_test_lib:kill_mnesia(Nodes), + ?verbose("Start Mnesia~n", []), mnesia_test_lib:start_mnesia(Nodes,[account,branch,teller,history]), - + ?verbose("Verify tabs~n", []), ?match(ok, mnesia_tpcb:verify_tabs()), if ReplicaType == ram_copies -> |