Merge branch 'maint'

4 files changed, 202 insertions, 41 deletions

diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/misc_error_1_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/misc_error_1_SUITE.erl
new file mode 100644
index 0000000000..4e20875505
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/misc_error_1_SUITE.erl
@@ -0,0 +1,154 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(misc_error_1_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,3}}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() -> 
+    [ct_fail_1, ct_fail_2, ct_fail_3, ts_fail_1, ts_fail_2,
+     killed_by_signal_1, killed_by_signal_2].
+
+ct_fail_1(_) ->
+    ct:fail({error,this_is_expected}),
+    exit(this_should_not_be_seen),
+    ok.
+
+ct_fail_2(_) ->
+    ct:fail("~w", [this_is_expected]),
+    exit(this_should_not_be_seen),
+    ok.
+
+ct_fail_3(_) ->
+    fail_me(fun() -> ct:fail(this_is_expected) end),
+    exit(this_should_not_be_seen),
+    ok.
+
+ts_fail_1(_) ->
+    test_server:fail(this_is_expected),
+    exit(this_should_not_be_seen),
+    ok.
+
+ts_fail_2(_) ->
+    fail_me(fun() -> test_server:fail(this_is_expected) end),
+    exit(this_should_not_be_seen),
+    ok.
+
+fail_me(Fun) ->
+    Fun(),
+    ok.
+
+killed_by_signal_1(_) ->
+    spawn_link(fun() -> ct:sleep(100),
+			exit(i_die_now)
+	       end),
+    ct:sleep(1000),
+    exit(this_should_not_be_seen).
+
+killed_by_signal_2(_) ->
+    TCPid = self(),
+    spawn_link(fun() -> ct:sleep(100),
+			exit(TCPid, kill)
+	       end),
+    ct:sleep(1000),
+    exit(this_should_not_be_seen).
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index 2f43c1bc17..b94f7f7593 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.6
+COMMON_TEST_VSN = 1.6.1
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index de946d4c4c..695a7caa7d 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -545,56 +545,60 @@ set_attributes(doc) ->
 set_attributes(suite) ->
     [];
 set_attributes(Config) when is_list(Config) ->
-    PrivDir =  ?config(priv_dir, Config),
-    FileName = filename:join(PrivDir, "test.txt"),
-    ReqId = 0,
-    {Cm, Channel} = ?config(sftp, Config),
+    case test_server:os_type() of
+	{win32, _} ->
+	    {skip,  "Known error bug in erts file:read_file_info"};
+	_ ->
+	    PrivDir =  ?config(priv_dir, Config),
+	    FileName = filename:join(PrivDir, "test.txt"),
+	    ReqId = 0,
+	    {Cm, Channel} = ?config(sftp, Config),
 
-    {ok, FileInfo} = file:read_file_info(FileName),
+	    {ok, FileInfo} = file:read_file_info(FileName),
 
-    OrigPermissions = FileInfo#file_info.mode,
-    Permissions = 8#600, %% User read-write-only
+	    OrigPermissions = FileInfo#file_info.mode,
+	    Permissions = not_default_permissions(),
 
-    Flags = ?SSH_FILEXFER_ATTR_PERMISSIONS,
+	    Flags = ?SSH_FILEXFER_ATTR_PERMISSIONS,
 
-    Atters = [?uint32(Flags), ?byte(?SSH_FILEXFER_TYPE_REGULAR),
-	      ?uint32(Permissions)],
+	    Atters = [?uint32(Flags), ?byte(?SSH_FILEXFER_TYPE_REGULAR),
+		      ?uint32(Permissions)],
 
-    {ok, <<?SSH_FXP_STATUS, ?UINT32(ReqId),
-	  ?UINT32(?SSH_FX_OK), _/binary>>, _} =
-	set_attributes_file(FileName, Atters, Cm, Channel, ReqId),
-
-    {ok, NewFileInfo} = file:read_file_info(FileName),
-    NewPermissions = NewFileInfo#file_info.mode,
-
-    %% Can not test that NewPermissions = Permissions as
-    %% on Unix platforms, other bits than those listed in the
-    %% API may be set.
-    test_server:format("Org: ~p New: ~p~n", [OrigPermissions, NewPermissions]),
-    true = OrigPermissions =/= NewPermissions,
-
-    test_server:format("Try to open the file"),
-    NewReqId = 2,
-    {ok, <<?SSH_FXP_HANDLE, ?UINT32(NewReqId), Handle/binary>>, _} =
-	open_file(FileName, Cm, Channel, NewReqId,
-		  ?ACE4_READ_DATA bor ?ACE4_WRITE_ATTRIBUTES,
-		  ?SSH_FXF_OPEN_EXISTING),
+	    {ok, <<?SSH_FXP_STATUS, ?UINT32(ReqId),
+		   ?UINT32(?SSH_FX_OK), _/binary>>, _} =
+		set_attributes_file(FileName, Atters, Cm, Channel, ReqId),
 
-    NewAtters = [?uint32(Flags), ?byte(?SSH_FILEXFER_TYPE_REGULAR),
-		 ?uint32(OrigPermissions)],
+	    {ok, NewFileInfo} = file:read_file_info(FileName),
+	    NewPermissions = NewFileInfo#file_info.mode,
 
-    NewReqId1 = 3,
+	    %% Can not test that NewPermissions = Permissions as
+	    %% on Unix platforms, other bits than those listed in the
+	    %% API may be set.
+	    test_server:format("Org: ~p New: ~p~n", [OrigPermissions, NewPermissions]),
+	    true = OrigPermissions =/= NewPermissions,
 
-    test_server:format("Set original permissions on the now open file"),
+	    test_server:format("Try to open the file"),
+	    NewReqId = 2,
+	    {ok, <<?SSH_FXP_HANDLE, ?UINT32(NewReqId), Handle/binary>>, _} =
+		open_file(FileName, Cm, Channel, NewReqId,
+			  ?ACE4_READ_DATA bor ?ACE4_WRITE_ATTRIBUTES,
+			  ?SSH_FXF_OPEN_EXISTING),
 
-     {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId1),
-	  ?UINT32(?SSH_FX_OK), _/binary>>, _} =
-	set_attributes_open_file(Handle, NewAtters, Cm, Channel, NewReqId1),
+	    NewAtters = [?uint32(Flags), ?byte(?SSH_FILEXFER_TYPE_REGULAR),
+			 ?uint32(OrigPermissions)],
 
-    {ok, NewFileInfo1} = file:read_file_info(FileName),
-    OrigPermissions = NewFileInfo1#file_info.mode,
+	    NewReqId1 = 3,
 
-    ok.
+	    test_server:format("Set original permissions on the now open file"),
+
+	    {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId1),
+		   ?UINT32(?SSH_FX_OK), _/binary>>, _} =
+		set_attributes_open_file(Handle, NewAtters, Cm, Channel, NewReqId1),
+
+	    {ok, NewFileInfo1} = file:read_file_info(FileName),
+	    OrigPermissions = NewFileInfo1#file_info.mode,
+	    ok
+    end.
 
 %%--------------------------------------------------------------------
 ver3_rename_OTP_6352(doc) ->
@@ -943,3 +947,6 @@ sshd_read_file(Config) when is_list(Config) ->
     {ok, Data} = file:read_file(FileName),
 
     ok.
+
+not_default_permissions() ->
+    8#600. %% User read-write-only
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index 88e3856cf4..a1f4559083 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1 +1 @@
-TEST_SERVER_VSN = 3.5
+TEST_SERVER_VSN = 3.5.1