Update os_mon tests to conform with common_test standard

1 files changed, 21 insertions, 15 deletions

diff --git a/lib/os_mon/test/disksup_SUITE.erl b/lib/os_mon/test/disksup_SUITE.erl
index 987d631c36..f21b8db2ae 100644
--- a/lib/os_mon/test/disksup_SUITE.erl
+++ b/lib/os_mon/test/disksup_SUITE.erl
@@ -17,10 +17,10 @@
 %% %CopyrightEnd%
 %%
 -module(disksup_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -50,19 +50,25 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    Bugs = [otp_5910],
-    case ?t:os_type() of
-	{unix, sunos} ->
-	    [api, config, alarm, port,
-	     {conf, terminate, [unavailable], restart}] ++ Bugs;
-	{unix, _OSname} ->
-	    [api, alarm] ++ Bugs;
-	{win32, _OSname} ->
-	    [api, alarm] ++ Bugs;
-	_OS ->
-	    [unavailable]
-    end.
+all() -> 
+Bugs = [otp_5910],
+	case test_server:os_type() of
+  {unix, sunos} ->
+      [api, config, alarm, port, unavailable] ++ Bugs;
+  {unix, _OSname} -> [api, alarm] ++ Bugs;
+  {win32, _OSname} -> [api, alarm] ++ Bugs;
+  _OS -> [unavailable]
+end.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 api(suite) ->
     [];