anchor.diff:  			{'DOWN', MonRef, _, _, {port_died, _Reason}} ->
   			    ok;
   			{'DOWN', MonRef, _, _, Reason} ->
  -			    ?line ?t:fail({unexpected_exit_reason, Reason})
  +			    ?t:fail({unexpected_exit_reason, Reason})
   		    after
   			3000 ->
  -			    ?line ?t:fail({still_alive, Str})
  +			    ?t:fail({still_alive, Str})
   		    end,
   
   		    %% Give os_mon_sup time to restart disksup
   		    ?t:sleep(?t:seconds(3)),
  -		    ?line [{_Disk2,Kbyte2,_Cap2}|_] =
  -			disksup:get_disk_data(),
  -		    ?line true = Kbyte2>0,
  +		    [{_Disk2,Kbyte2,_Cap2}|_] =
  +		    disksup:get_disk_data(),
  +		    true = Kbyte2>0,
   
   		    ok;
   
  
positive.code: 	    {skip, {os_pid_not_found, Str}}
      end.
  
  terminate(suite) ->
      [];
  terminate(Config) when is_list(Config) ->
      ?line ok = application:set_env(os_mon, start_disksup, false),
      ?line ok = supervisor:terminate_child(os_mon_sup, disksup),
      ok.
  
  unavailable(suite) ->
      [];
  unavailable(doc) ->
      ["Test correct behaviour when service is unavailable"];
  unavailable(Config) when is_list(Config) ->
  
      %% Make sure all API functions return their dummy values
      ?line [{"none",0,0}] = disksup:get_disk_data(),
      ?line 1800000 = disksup:get_check_interval(),
      ?line ok = disksup:set_check_interval(5),
      ?line 80 = disksup:get_almost_full_threshold(),
      ?line ok = disksup:set_almost_full_threshold(0.9),
  
      ok.
  
  restart(suite) ->
      [];
  restart(Config) when is_list(Config) ->
      ?line ok = application:set_env(os_mon, start_disksup, true),
      ?line {ok, _Pid} = supervisor:restart_child(os_mon_sup, disksup),
      ok.
  
  otp_5910(suite) ->
      [];
  otp_5910(doc) ->
      ["Test that alarms are cleared if disksup crashes or "
       "if OS_Mon is stopped"];
  otp_5910(Config) when is_list(Config) ->
  
      %% Make sure disksup sets at least one alarm
      ?line Data = disksup:get_disk_data(),
      ?line Threshold0 = disksup:get_almost_full_threshold(),
      ?line Threshold = case over_threshold(Data, Threshold0) of
  			  0 ->
  			      [{_Id,_Kbyte,Cap}|_] = Data,
  			      ?line ok = disksup:set_almost_full_threshold((Cap-1)/100),
  			      Cap-1;
  			  _N ->
  			      Threshold0
  		      end,
      ?line ok = application:set_env(os_mon,
  				   disk_almost_full_threshold,
  				   Threshold/100),
      ?line disksup ! timeout, % force a disk check
      ?line Data2 = disksup:get_disk_data(),
      ?line Over = over_threshold(Data2, Threshold),
      ?line Alarms = get_alarms(),
      if
  	Over==0 ->
  	    ?line ?t:fail({threshold_too_low, Data2, Threshold});
  	Over==length(Alarms) ->
  	    ok;
  	true ->
  	    dump_info(),
  	    ?line ?t:fail({bad_alarms, Threshold, Data2, Alarms})
      end,
  
      %% Kill disksup
  
negative.code:     [].
  
  get_alarms() ->
      lists:filter(fun
  	    ({{disk_almost_full, _Disk},_}) -> true;
  	    (_) -> false
  	end, alarm_handler:get_alarms()).
  
  until(Fun, [H|T]) ->
      case Fun(H) of
  	true -> H;
  	false -> until(Fun, T)
      end;
  until(_Fun, []) -> false.
  
  port(suite) -> [];
  port(doc) ->
      ["Test that disksup handles a terminating port program"];
  port(Config) when is_list(Config) ->
      Str = os:cmd("ps -ef | grep '[d]isksup'"),
      case io_lib:fread("~s ~s", Str) of
  	{ok, [_Uid,Pid], _Rest} ->
  
  	    %% Monitor disksup
  	    MonRef = erlang:monitor(process, disksup),
  	    [{_Disk1,Kbyte1,_Cap1}|_] = disksup:get_disk_data(),
  	    true = Kbyte1>0,
  
  	    %% Kill the port program
  	    case os:cmd("kill -9 " ++ Pid) of
  