aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/z_SUITE.erl
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-07-21 19:07:16 +0200
committerRickard Green <[email protected]>2016-07-26 17:37:40 +0200
commit99a29386cb1a62bc7e9c205d897cd20017c598b4 (patch)
tree74e962b88678fd47492c37f99af05501007b2459 /erts/emulator/test/z_SUITE.erl
parent832985da5c5ca3f7635d77aaa31904d79adeb37e (diff)
downloadotp-99a29386cb1a62bc7e9c205d897cd20017c598b4.tar.gz
otp-99a29386cb1a62bc7e9c205d897cd20017c598b4.tar.bz2
otp-99a29386cb1a62bc7e9c205d897cd20017c598b4.zip
Ignore long time failures during high CPU utilization
Diffstat (limited to 'erts/emulator/test/z_SUITE.erl')
-rw-r--r--erts/emulator/test/z_SUITE.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/erts/emulator/test/z_SUITE.erl b/erts/emulator/test/z_SUITE.erl
index d1085c1958..ab56018373 100644
--- a/erts/emulator/test/z_SUITE.erl
+++ b/erts/emulator/test/z_SUITE.erl
@@ -191,7 +191,13 @@ node_container_refc_check(Config) when is_list(Config) ->
ok.
long_timers(Config) when is_list(Config) ->
- ok = long_timers_test:check_result().
+ case long_timers_test:check_result() of
+ ok -> ok;
+ high_cpu -> {comment, "Ignored failures due to high CPU utilization"};
+ missing_cpu_info -> {comment, "Ignored failures due to missing CPU utilization information"};
+ Fail -> ct:fail(Fail)
+ end.
+
pollset_size(Config) when is_list(Config) ->
Name = pollset_size_testcase_initial_state_holder,