summaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-09-04 21:17:13 +0200
committerJose <jose@zeroc.com>2018-09-04 21:17:13 +0200
commit9c4b8513f13643681da85170155291f578a0d5a3 (patch)
tree9b9a9a21f2edb9a3f9db14c2dfcbd814d77d0ed0 /ruby
parentAdd support for read properties from HKCU windows registry (diff)
downloadice-9c4b8513f13643681da85170155291f578a0d5a3.tar.bz2
ice-9c4b8513f13643681da85170155291f578a0d5a3.tar.xz
ice-9c4b8513f13643681da85170155291f578a0d5a3.zip
Enable test workers for PHP, Ruby and Python
Close #185
Diffstat (limited to 'ruby')
-rw-r--r--ruby/test/Ice/info/AllTests.rb8
-rw-r--r--ruby/test/Ice/proxy/AllTests.rb3
2 files changed, 4 insertions, 7 deletions
diff --git a/ruby/test/Ice/info/AllTests.rb b/ruby/test/Ice/info/AllTests.rb
index de22b967724..dc415b57f0e 100644
--- a/ruby/test/Ice/info/AllTests.rb
+++ b/ruby/test/Ice/info/AllTests.rb
@@ -79,9 +79,9 @@ def allTests(helper, communicator)
print "test connection endpoint information..."
STDOUT.flush
-
+ port = helper.getTestPort()
tcpinfo = getTCPEndpointInfo(base.ice_getConnection().getEndpoint().getInfo())
- test(tcpinfo.port == 12010)
+ test(tcpinfo.port == port)
test(!tcpinfo.compress)
test(tcpinfo.host == defaultHost)
@@ -92,7 +92,7 @@ def allTests(helper, communicator)
test(port > 0)
udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
- test(udp.port == 12010)
+ test(udp.port == port)
test(udp.host == defaultHost)
puts "ok"
@@ -108,7 +108,7 @@ def allTests(helper, communicator)
test(!info.incoming)
test(info.adapterName.length == 0)
- test(tcpinfo.remotePort == 12010)
+ test(tcpinfo.remotePort == port)
if defaultHost == "127.0.0.1"
test(tcpinfo.remoteAddress == defaultHost)
test(tcpinfo.localAddress == defaultHost)
diff --git a/ruby/test/Ice/proxy/AllTests.rb b/ruby/test/Ice/proxy/AllTests.rb
index 44fe4bc24f3..6e332f9c773 100644
--- a/ruby/test/Ice/proxy/AllTests.rb
+++ b/ruby/test/Ice/proxy/AllTests.rb
@@ -808,9 +808,6 @@ def allTests(helper, communicator)
if communicator.getProperties().getPropertyAsInt("Ice.IPv6") == 0
ssl = communicator.getProperties().getProperty("Ice.Default.Protocol") == "ssl"
tcp = communicator.getProperties().getProperty("Ice.Default.Protocol") == "tcp"
- if tcp
- p1.ice_encodingVersion(Ice::Encoding_1_0).ice_ping()
- end
# Two legal TCP endpoints expressed as opaque endpoints
p1 = communicator.stringToProxy("test -e 1.0:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMusuAAAQJwAAAA==")