diff options
author | Henrik Nord <[email protected]> | 2015-10-06 11:03:55 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2015-10-06 11:03:55 +0200 |
commit | b99010e5f188097fd9a83204ac6ce2dcd048e640 (patch) | |
tree | 2b789952bc80fd1585dde569116cc604f9962ab7 /lib/mnesia/test/mnesia_evil_backup.erl | |
parent | 7283245d4a3fd6b59f0b0f2748cad5c61733622d (diff) | |
parent | 4f9905824002bebc33c2914669b4c364927cb0ee (diff) | |
download | otp-b99010e5f188097fd9a83204ac6ce2dcd048e640.tar.gz otp-b99010e5f188097fd9a83204ac6ce2dcd048e640.tar.bz2 otp-b99010e5f188097fd9a83204ac6ce2dcd048e640.zip |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/mnesia/test/mnesia_evil_backup.erl')
-rw-r--r-- | lib/mnesia/test/mnesia_evil_backup.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/mnesia/test/mnesia_evil_backup.erl b/lib/mnesia/test/mnesia_evil_backup.erl index 89f2861661..e605fa7926 100644 --- a/lib/mnesia/test/mnesia_evil_backup.erl +++ b/lib/mnesia/test/mnesia_evil_backup.erl @@ -232,7 +232,13 @@ restore(Config, Op) -> Res21 = [{Tab2, N, N+1} || N <- lists:seq(1, 11)], Res31 = [[{Tab3, N, N+1}, {Tab3, N, N+44}] || N <- lists:seq(1, 10)], - + Check = fun() -> + [disk_log:pid2name(X) || + X <- processes(), Data <- [process_info(X, [current_function])], + Data =/= undefined, + element(1, element(2, lists:keyfind(current_function, 1, Data)))=:= disk_log] + end, + Before = Check(), ?match({atomic, [Tab1]}, Restore(File1, [{Op, [Tab1]}, {skip_tables, Tabs -- [Tab1]}])), case Op of @@ -319,6 +325,8 @@ restore(Config, Op) -> end, ?match(ok, file:delete(File1)), ?match(ok, file:delete(File2)), + ?match([], Check() -- Before), + ?verify_mnesia(Nodes, []). |