diff options
| author | Niclas Eklund <[email protected]> | 2011-03-03 14:50:42 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-03-03 14:50:42 +0100 |
| commit | 8c4ece5c36e153e739f344eccadd01b4c3e7ccce (patch) | |
| tree | 7a9b26ea0b84670c6a404f1873cde80dc5c28528 /lib/orber/test | |
| parent | 45892fd845b74532a6cae750372b6e80eb8e3ad9 (diff) | |
| parent | 4414036566181c45f592036a03a3b5898f725d95 (diff) | |
| download | otp-8c4ece5c36e153e739f344eccadd01b4c3e7ccce.tar.gz otp-8c4ece5c36e153e739f344eccadd01b4c3e7ccce.tar.bz2 otp-8c4ece5c36e153e739f344eccadd01b4c3e7ccce.zip | |
Merge branch 'nick/CORBA/avoid_warnings/OTP-9050' into dev
* nick/CORBA/avoid_warnings/OTP-9050:
Removed code commented out.
More specs removed.
More specs removed.
More specs removed.
Removed more spec:s that wasn't needed.
Removed spec:s that wasn't needed.
Updated light weight tests.
Updsated macro EFORMAT exit handling.
Corrected spec usage.
Eliminated Dialyzer warnings when using exit or throw.
Conflicts:
lib/cosEvent/doc/src/notes.xml
lib/cosEvent/vsn.mk
lib/cosEventDomain/doc/src/notes.xml
lib/cosEventDomain/vsn.mk
lib/cosNotification/vsn.mk
lib/cosProperty/doc/src/notes.xml
lib/cosProperty/vsn.mk
lib/cosTime/doc/src/notes.xml
lib/cosTime/vsn.mk
lib/orber/include/ifr_types.hrl
lib/orber/vsn.mk
Diffstat (limited to 'lib/orber/test')
| -rw-r--r-- | lib/orber/test/csiv2_SUITE.erl | 10 | ||||
| -rw-r--r-- | lib/orber/test/multi_ORB_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/orber/test/orber_test_lib.erl | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/lib/orber/test/csiv2_SUITE.erl b/lib/orber/test/csiv2_SUITE.erl index e7c79b9e84..95cd8c56b3 100644 --- a/lib/orber/test/csiv2_SUITE.erl +++ b/lib/orber/test/csiv2_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2010. All Rights Reserved. +%% Copyright Ericsson AB 2005-2011. 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 @@ -675,8 +675,8 @@ ssl_server_peercert_api(_Config) -> {ok, Socket} = ?match({ok, _}, fake_client_ORB(ssl, ServerHost, ServerPort, SSLOptions)), {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)), - ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])), - ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])), +%% ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])), +%% ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])), % ?match({ok, #'Certificate'{}}, % 'OrberCSIv2':decode('Certificate', PeerCert)), destroy_fake_ORB(ssl, Socket), @@ -715,8 +715,8 @@ ssl_client_peercert_api(_Config) -> ?match(ok, ssl:ssl_accept(Socket)), {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)), - ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])), - ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])), +%% ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])), +%% ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])), % ?match({ok, #'Certificate'{}}, % 'OrberCSIv2':decode('Certificate', PeerCert)), ssl:close(Socket), diff --git a/lib/orber/test/multi_ORB_SUITE.erl b/lib/orber/test/multi_ORB_SUITE.erl index 6ac514eb77..608fb23f3e 100644 --- a/lib/orber/test/multi_ORB_SUITE.erl +++ b/lib/orber/test/multi_ORB_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2010. All Rights Reserved. +%% Copyright Ericsson AB 1999-2011. 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 @@ -1391,7 +1391,7 @@ light_orber2_api(_Config) -> LocalHost = net_adm:localhost(), {ok, Node, _Host} = ?match({ok,_,_}, orber_test_lib:js_node([], - {lightweigth, ["iiop://"++LocalHost++":"++integer_to_list(orber:iiop_port())]})), + {lightweight, ["iiop://"++LocalHost++":"++integer_to_list(orber:iiop_port())]})), ?match(ok, orber:info(io)), ?match([_], orber_test_lib:remote_apply(Node, orber_env, get_lightweight_nodes,[])), diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl index 5053a5fddc..ffc13d0e3c 100644 --- a/lib/orber/test/orber_test_lib.erl +++ b/lib/orber/test/orber_test_lib.erl @@ -301,9 +301,11 @@ start_ssl(true, Node) -> start_ssl(_, _) -> ok. -start_orber({lightweigth, Options}, Node) -> +start_orber({lightweight, Options}, Node) -> + ok = rpc:call(Node, mnesia, start, []), ok = rpc:call(Node, orber, start_lightweight, [Options]); start_orber(lightweight, Node) -> + ok = rpc:call(Node, mnesia, start, []), ok = rpc:call(Node, orber, start_lightweight, []); start_orber(_, Node) -> ok = rpc:call(Node, orber, jump_start, []). |