aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2019-01-08 12:08:06 +0100
committerSiri Hansen <[email protected]>2019-01-08 12:08:06 +0100
commitd8419d80da6d021388f4e562c2b4fcaea54f7800 (patch)
tree85beee92b3290495abda77ea9862b6b9ad519a0d
parent21b6c9bbd28c2a380b00b195da9338979bebcaf7 (diff)
parent38840a424cf7b0729025951a8dee43cf96abfd1c (diff)
downloadotp-d8419d80da6d021388f4e562c2b4fcaea54f7800.tar.gz
otp-d8419d80da6d021388f4e562c2b4fcaea54f7800.tar.bz2
otp-d8419d80da6d021388f4e562c2b4fcaea54f7800.zip
Merge branch 'siri/cuddle' into maint
* siri/cuddle: [cdv] Check only own persistent terms in crashdump_viewer test
-rw-r--r--lib/observer/test/crashdump_helper.erl3
-rw-r--r--lib/observer/test/crashdump_viewer_SUITE.erl5
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index d5d3649525..d6b5eff9b5 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -204,5 +204,4 @@ dump_persistent_terms() ->
create_persistent_terms() ->
persistent_term:put({?MODULE,first}, {pid,42.0}),
persistent_term:put({?MODULE,second}, [1,2,3]),
- persistent_term:get().
-
+ {persistent_term:get({?MODULE,first}),persistent_term:get({?MODULE,second})}.
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 8c5e618f4a..31cf7011d4 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -615,9 +615,8 @@ special(File,Procs) ->
#proc{dict=Dict} = ProcDetails,
%% io:format("~p\n", [Dict]),
- Pts1 = crashdump_helper:create_persistent_terms(),
- Pts2 = proplists:get_value(pts,Dict),
- true = lists:sort(Pts1) =:= lists:sort(Pts2),
+ Pts = crashdump_helper:create_persistent_terms(),
+ Pts = proplists:get_value(pts,Dict),
io:format(" persistent terms ok",[]),
ok;
_ ->