diff options
| author | Lars Thorsen <[email protected]> | 2014-08-01 11:38:17 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2014-08-01 11:38:17 +0200 |
| commit | b1d3fd0943df21a4928ace4101404be97609556d (patch) | |
| tree | 2c046a43b88e83f9e621e47d01ab828a0aed51c5 /lib | |
| parent | a5882ef5652f6e44cecc29d7d0b53ebc0d94f007 (diff) | |
| download | otp-b1d3fd0943df21a4928ace4101404be97609556d.tar.gz otp-b1d3fd0943df21a4928ace4101404be97609556d.tar.bz2 otp-b1d3fd0943df21a4928ace4101404be97609556d.zip | |
[orber] Fix bug in testcase
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/orber/test/ip_v4v6_interop_SUITE.erl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/orber/test/ip_v4v6_interop_SUITE.erl b/lib/orber/test/ip_v4v6_interop_SUITE.erl index 4fad17be1a..5eee5a29c2 100644 --- a/lib/orber/test/ip_v4v6_interop_SUITE.erl +++ b/lib/orber/test/ip_v4v6_interop_SUITE.erl @@ -82,12 +82,16 @@ %% Initialization functions. %%====================================================================== -init_per_testcase(_Case, Config) -> +init_per_testcase(_Case, Config) -> + %% Starting dual configured ORB + orber:jump_start([{iiop_port, 10001}, {flags, 16#1000}]), + orber:info(), Dog=test_server:timetrap(?default_timeout), [{watchdog, Dog}|Config]. end_per_testcase(_Case, Config) -> + orber:jump_stop(), Dog = ?config(watchdog, Config), test_server:timetrap_cancel(Dog), ok. @@ -135,14 +139,11 @@ dual_ipv4v6(_Config) -> ?match({ok,_,_}, orber_test_lib:js_node([{iiop_port, 6001}, {flags, 16#0100}])), Ipv6NS = orber_test_lib:remote_apply(Ipv6Node, corba, resolve_initial_references, ["NameService"]), - %% Starting dual configured ORB - orber:jump_start([{iiop_port, 10001}, {flags, 16#1000}]), - ?match({ok, _}, orber:add_listen_interface("FEC0:0:0:0:0222:64FF:FEA7:3C02", normal, - [{ip_family, inet6}, {iiop_port, 10002}])), - orber:info(), + %% Add the ipv6 interface in the dual configured ORB + ?match({ok, _}, orber:add_listen_interface("::1", normal, + [{ip_family, inet6}, {iiop_port, 10002}])), DualNS = corba:resolve_initial_references("NameService"), - %% Bind IPv4 NameServer to a name in the dual stack orbs NameServer NSDual4 = orber_test_lib:remote_apply(Ipv4Node, corba, resolve_initial_references_remote, ["NameService", ["iiop://127.0.0.1:10001"]]), @@ -152,7 +153,7 @@ dual_ipv4v6(_Config) -> %% Bind IPv6 NameServer to a name in the dual stack orbs NameServer NSDual6 = orber_test_lib:remote_apply(Ipv6Node, corba, resolve_initial_references_remote, - ["NameService", ["iiop://[FEC0:0:0:0:0222:64FF:FEA7:3C02]:10002"]]), + ["NameService", ["iiop://[::1]:10002"]]), ?match(ok, orber_test_lib:remote_apply(Ipv6Node, 'CosNaming_NamingContext', bind, [NSDual6, lname:new(["ns6"]), Ipv6NS])), 'CosNaming_NamingContext':resolve(DualNS, lname:new(["ns6"])), @@ -193,6 +194,6 @@ dual_ipv4v6(_Config) -> ?match(2, length(Ipv4Names)), io:format("\nNames in IPv6 NS: ~p\n", [Ipv6Names]), ?match(2, length(Ipv6Names)), - + ok. |