aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-05-13 10:36:45 +0200
committerDan Gudmundsson <[email protected]>2016-05-13 10:36:45 +0200
commitab53372faa243e65d72bbea3e4aac365a232fdf1 (patch)
tree21038d0244ae8c32c5a604ed2d2d636e06ea28b0 /lib
parent78da03f2a3f362cdaed0091394520f1cf1608244 (diff)
downloadotp-ab53372faa243e65d72bbea3e4aac365a232fdf1.tar.gz
otp-ab53372faa243e65d72bbea3e4aac365a232fdf1.tar.bz2
otp-ab53372faa243e65d72bbea3e4aac365a232fdf1.zip
Test cuddling
Tests on slow vnc server times out.
Diffstat (limited to 'lib')
-rw-r--r--lib/observer/src/observer_sys_wx.erl1
-rw-r--r--lib/observer/test/observer_SUITE.erl2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/observer/src/observer_sys_wx.erl b/lib/observer/src/observer_sys_wx.erl
index 30cecabead..fa824995f7 100644
--- a/lib/observer/src/observer_sys_wx.erl
+++ b/lib/observer/src/observer_sys_wx.erl
@@ -80,6 +80,7 @@ create_sys_menu(Parent) ->
#create_menu{id = ?ID_REFRESH_INTERVAL, text = "Refresh interval"}]},
observer_wx:create_menus(Parent, [View]).
+update_syspage(#sys_wx_state{node = undefined}) -> ignore;
update_syspage(#sys_wx_state{node = Node, fields=Fields, sizer=Sizer}) ->
SysInfo = observer_wx:try_rpc(Node, observer_backend, sys_info, []),
{Sys, Mem, Cpu, Stats} = info_fields(),
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 3dc3e4772b..ae8111dcd6 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -38,7 +38,7 @@
]).
%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
+-define(default_timeout, ?t:minutes(2)).
suite() -> [{ct_hooks,[ts_install_cth]}].