prim_file_SUITE: Remove the short 5 seconds timetrap timeout

Several tests cases would typically fail because of a timetrap
timeout on our older test machines running with a Linux kernel
with a lower version than 2.6.30 and the ext3 file system.

In http://lwn.net/Articles/328363/, the author desribes peformance
issues with ext3 that were fixed in 2.6.30.

Since common_test nowadays has a default timetrap timeout, there
is no need to explicitly set a timeout in each test case (except
for prolonging the default timeout).

1 files changed, 2 insertions, 50 deletions

diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 3e6a85eadd..97d66eab81 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -183,7 +183,6 @@ time_dist({_D1, _T1} = DT1, {_D2, _T2} = DT2) ->
 read_write_file(suite) -> [];
 read_write_file(doc) -> [];
 read_write_file(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
 			       atom_to_list(?MODULE)
@@ -232,7 +231,6 @@ read_write_file(Config) when is_list(Config) ->
     ?line {ok,Bin5} = ?PRIM_FILE:read_file(Name),
     ?line {Bin1,Bin2} = split_binary(Bin5,byte_size(Bin1)),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -254,7 +252,6 @@ make_del_dir_b(Config) when is_list(Config) ->
     Result.
 
 make_del_dir(Config, Handle, Suffix) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line NewDir = filename:join(RootDir, 
 				 atom_to_list(?MODULE)
@@ -302,9 +299,7 @@ make_del_dir(Config, Handle, Suffix) ->
 		  {error, einval} -> ok		%FreeBSD
 	      end,
 	?line {error, enoent} = ?PRIM_FILE_call(del_dir, Handle, [""]),
-	?line {error, badarg} = ?PRIM_FILE_call(del_dir, Handle, [[3,2,1,{}]]),
-
-	?line test_server:timetrap_cancel(Dog)
+	?line {error, badarg} = ?PRIM_FILE_call(del_dir, Handle, [[3,2,1,{}]])
     after
 	?line ok = ?PRIM_FILE_call(set_cwd, Handle, [CurrentDir])
     end,
@@ -324,7 +319,6 @@ cur_dir_0b(Config) when is_list(Config) ->
     Result.
 
 cur_dir_0(Config, Handle) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     %% Find out the current dir, and cd to it ;-)
     ?line {ok,BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
     ?line Dir1 = BaseDir ++ "", %% Check that it's a string
@@ -385,7 +379,6 @@ cur_dir_0(Config, Handle) ->
     ?line {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
     ?line false = lists:member($\\, BaseDir),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests ?PRIM_FILE:get_cwd/1.
@@ -404,8 +397,6 @@ cur_dir_1b(Config) when is_list(Config) ->
     Result.
 
 cur_dir_1(Config, Handle) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-
     ?line case os:type() of
 	      {win32, _} ->
 		  win_cur_dir_1(Config, Handle);
@@ -413,7 +404,6 @@ cur_dir_1(Config, Handle) ->
 		  ?line {error, enotsup} =
 		      ?PRIM_FILE_call(get_cwd, Handle, ["d:"])
 	  end,
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 	
 win_cur_dir_1(_Config, Handle) ->
@@ -439,7 +429,6 @@ win_cur_dir_1(_Config, Handle) ->
 open1(suite) -> [];
 open1(doc) -> [];
 open1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line NewDir = filename:join(RootDir, 
 				 atom_to_list(?MODULE)
@@ -465,7 +454,6 @@ open1(Config) when is_list(Config) ->
     ?line {ok,Fd3} = ?PRIM_FILE:open(Name, [read]),
     ?line eof = ?PRIM_FILE:read(Fd3,Length),
     ?line ok = ?PRIM_FILE:close(Fd3),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests all open modes.
@@ -517,7 +505,6 @@ modes(Config) when is_list(Config) ->
 close(suite) -> [];
 close(doc) -> [];
 close(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
 			       atom_to_list(?MODULE)
@@ -534,13 +521,11 @@ close(Config) when is_list(Config) ->
     ?line Val = ?PRIM_FILE:close(Fd1),
     ?line io:format("Second close gave: ~p", [Val]),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 access(suite) -> [];
 access(doc) -> [];
 access(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
 			       atom_to_list(?MODULE)
@@ -562,7 +547,6 @@ access(Config) when is_list(Config) ->
     ?line {ok, Str} = ?PRIM_FILE:read(Fd3,length(Str)),
     ?line ok = ?PRIM_FILE:close(Fd3),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests ?PRIM_FILE:read/2 and ?PRIM_FILE:write/2.
@@ -570,7 +554,6 @@ access(Config) when is_list(Config) ->
 read_write(suite) -> [];
 read_write(doc) -> [];
 read_write(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
 				 atom_to_list(?MODULE)
@@ -582,7 +565,6 @@ read_write(Config) when is_list(Config) ->
     ?line {ok, Fd} = ?PRIM_FILE:open(Name, [read, write]),
     ?line read_write_test(Fd),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 read_write_test(File) ->
@@ -600,7 +582,6 @@ read_write_test(File) ->
 pread_write(suite) -> [];
 pread_write(doc) -> [];
 pread_write(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
 				 atom_to_list(?MODULE)
@@ -612,7 +593,6 @@ pread_write(Config) when is_list(Config) ->
     ?line {ok, Fd} = ?PRIM_FILE:open(Name, [read, write]),
     ?line pread_write_test(Fd),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 pread_write_test(File) ->
@@ -632,7 +612,6 @@ pread_write_test(File) ->
 append(doc) -> "Test appending to a file.";
 append(suite) -> [];
 append(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir, Config),
     ?line NewDir = filename:join(RootDir, 
 				 atom_to_list(?MODULE)
@@ -659,13 +638,11 @@ append(Config) when is_list(Config) ->
     ?line Expected = list_to_binary([First, Second, Third]),
     ?line {ok, Expected} = ?PRIM_FILE:read_file(Name1),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 exclusive(suite) -> [];
 exclusive(doc) -> "Test exclusive access to a file.";
 exclusive(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line NewDir = filename:join(RootDir,
 				 atom_to_list(?MODULE)
@@ -675,7 +652,6 @@ exclusive(Config) when is_list(Config) ->
     ?line {ok,Fd} = ?PRIM_FILE:open(Name, [write, exclusive]),
     ?line {error, eexist} = ?PRIM_FILE:open(Name, [write, exclusive]),
     ?line ok = ?PRIM_FILE:close(Fd),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -684,7 +660,6 @@ exclusive(Config) when is_list(Config) ->
 pos1(suite) -> [];
 pos1(doc) -> [];
 pos1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
 			       atom_to_list(?MODULE)
@@ -741,13 +716,11 @@ pos1(Config) when is_list(Config) ->
     ?line {ok, 0}   = ?PRIM_FILE:position(Fd2,{eof,-8}), 
     ?line {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
     ?line {error, einval} = ?PRIM_FILE:position(Fd2,{eof,-9}),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 pos2(suite) -> [];
 pos2(doc) -> [];
 pos2(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
 			       atom_to_list(?MODULE)
@@ -764,7 +737,6 @@ pos2(Config) when is_list(Config) ->
     ?line {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
 
     ?line io:format("DONE"),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 
@@ -782,7 +754,6 @@ file_info_basic_file_b(Config) when is_list(Config) ->
     Result.
 
 file_info_basic_file(Config, Handle, Suffix) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir, Config),
 
     %% Create a short file.
@@ -811,7 +782,6 @@ file_info_basic_file(Config, Handle, Suffix) ->
     ?line {MD, MT} = ModifyTime,
     ?line all_integers(tuple_to_list(MD) ++ tuple_to_list(MT)),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 file_info_basic_directory_a(suite) -> [];
@@ -828,8 +798,6 @@ file_info_basic_directory_b(Config) when is_list(Config) ->
     Result.
 
 file_info_basic_directory(Config, Handle) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?PRIM_FILE:read_file_info/1 to work on
     %% platforms such as Windows95.
@@ -849,7 +817,7 @@ file_info_basic_directory(Config, Handle) ->
 	      _ ->
 		  ?line test_directory("/", read, Handle)
 	  end,
-    ?line test_server:timetrap_cancel(Dog).
+    ok.
 
 test_directory(Name, ExpectedAccess, Handle) ->
     ?line {ok, FileInfo} = ?PRIM_FILE_call(read_file_info, Handle, [Name]),
@@ -890,14 +858,12 @@ file_info_bad_b(Config) when is_list(Config) ->
     Result.
 
 file_info_bad(Config, Handle) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = filename:join([?config(priv_dir, Config)]),
     ?line {error, enoent} = 
 	?PRIM_FILE_call(
 	   read_file_info, Handle, 
 	   [filename:join(RootDir,
 			  atom_to_list(?MODULE)++"_nonexistent")]),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %% Test that the file times behave as they should.
@@ -1192,7 +1158,6 @@ get_good_directory(Config) ->
 truncate(suite) -> [];
 truncate(doc) -> [];
 truncate(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
 			       atom_to_list(?MODULE)
@@ -1218,14 +1183,12 @@ truncate(Config) when is_list(Config) ->
     ?line {ok, 5} = ?PRIM_FILE:position(Fd2, 5),
     ?line {error, _} = ?PRIM_FILE:truncate(Fd2),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 
 datasync(suite) -> [];
 datasync(doc) -> "Tests that ?PRIM_FILE:datasync/1 at least doesn't crash.";
 datasync(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line PrivDir = ?config(priv_dir, Config),
     ?line Sync = filename:join(PrivDir,
 			       atom_to_list(?MODULE)
@@ -1236,14 +1199,12 @@ datasync(Config) when is_list(Config) ->
     ?line ok = ?PRIM_FILE:datasync(Fd),
     ?line ok = ?PRIM_FILE:close(Fd),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 
 sync(suite) -> [];
 sync(doc) -> "Tests that ?PRIM_FILE:sync/1 at least doesn't crash.";
 sync(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line PrivDir = ?config(priv_dir, Config),
     ?line Sync = filename:join(PrivDir, 
 			       atom_to_list(?MODULE)
@@ -1254,14 +1215,12 @@ sync(Config) when is_list(Config) ->
     ?line ok = ?PRIM_FILE:sync(Fd),
     ?line ok = ?PRIM_FILE:close(Fd),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 
 advise(suite) -> [];
 advise(doc) -> "Tests that ?PRIM_FILE:advise/4 at least doesn't crash.";
 advise(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line PrivDir = ?config(priv_dir, Config),
     ?line Advise = filename:join(PrivDir,
 			       atom_to_list(?MODULE)
@@ -1325,7 +1284,6 @@ advise(Config) when is_list(Config) ->
     ?line eof = ?PRIM_FILE:read_line(Fd9),
     ?line ok = ?PRIM_FILE:close(Fd9),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1369,7 +1327,6 @@ check_large_write(Dog, Fd, _, _, []) ->
 allocate(suite) -> [];
 allocate(doc) -> "Tests that ?PRIM_FILE:allocate/3 at least doesn't crash.";
 allocate(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line PrivDir = ?config(priv_dir, Config),
     ?line Allocate = filename:join(PrivDir,
 			       atom_to_list(?MODULE)
@@ -1402,7 +1359,6 @@ allocate(Config) when is_list(Config) ->
     ?line ok = ?PRIM_FILE:write(Fd4, Line2),
     ?line ok = ?PRIM_FILE:close(Fd4),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 allocate_and_assert(Fd, Offset, Length) ->
@@ -1450,7 +1406,6 @@ delete_b(Config) when is_list(Config) ->
     Result.
 
 delete(Config, Handle, Suffix) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line Name = filename:join(RootDir, 
 			       atom_to_list(?MODULE)
@@ -1466,7 +1421,6 @@ delete(Config, Handle, Suffix) ->
     ?line {error, _} = ?PRIM_FILE:open(Name, [read]),
     %% Try deleting a nonexistent file
     ?line {error, enoent} = ?PRIM_FILE_call(delete, Handle, [Name]),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 rename_a(suite) ->[];
@@ -1483,7 +1437,6 @@ rename_b(Config) when is_list(Config) ->
     Result.
 
 rename(Config, Handle, Suffix) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     ?line RootDir = ?config(priv_dir,Config),
     ?line FileName1 = atom_to_list(?MODULE)++"_rename"++Suffix++".fil",
     ?line FileName2 = atom_to_list(?MODULE)++"_rename"++Suffix++".ful",
@@ -1536,7 +1489,6 @@ rename(Config, Handle, Suffix) ->
 	?PRIM_FILE_call(rename, Handle, [DirName2, Name2foo]),
     ?line io:format("Errmsg2: ~p",[Msg2]),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%