summaryrefslogtreecommitdiff
path: root/demoscript/Ice
diff options
context:
space:
mode:
Diffstat (limited to 'demoscript/Ice')
-rw-r--r--demoscript/Ice/async.py11
-rw-r--r--demoscript/Ice/bidir.py20
-rw-r--r--demoscript/Ice/callback.py6
-rw-r--r--demoscript/Ice/hello.py23
-rw-r--r--demoscript/Ice/interleaved.py22
-rw-r--r--demoscript/Ice/invoke.py8
-rw-r--r--demoscript/Ice/multicast.py16
-rw-r--r--demoscript/Ice/nested.py10
-rw-r--r--demoscript/Ice/nrvo.py6
-rw-r--r--demoscript/Ice/plugin.py6
-rw-r--r--demoscript/Ice/serialize.py10
-rw-r--r--demoscript/Ice/session.py11
-rw-r--r--demoscript/Ice/throughput.py19
-rw-r--r--demoscript/Ice/value.py6
14 files changed, 78 insertions, 96 deletions
diff --git a/demoscript/Ice/async.py b/demoscript/Ice/async.py
index cf779aa04f4..8b98d0eea21 100644
--- a/demoscript/Ice/async.py
+++ b/demoscript/Ice/async.py
@@ -9,11 +9,10 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
+import Expect
def run(client, server):
- print "testing client... ",
+ sys.stdout.write("testing client... ")
sys.stdout.flush()
client.sendline('i')
server.expect('Hello World!')
@@ -25,9 +24,9 @@ def run(client, server):
client.sendline('i')
server.expect('Hello World!')
server.expect('Hello World!')
- print "ok"
+ print("ok")
- print "testing shutdown... ",
+ sys.stdout.write("testing shutdown... ")
sys.stdout.flush()
client.sendline('d')
client.sendline('s')
@@ -36,4 +35,4 @@ def run(client, server):
client.expect('RequestCanceledException')
client.sendline('x')
client.waitTestSuccess()
- print "ok"
+ print("ok")
diff --git a/demoscript/Ice/bidir.py b/demoscript/Ice/bidir.py
index 09cb838c040..6cdca77fa30 100644
--- a/demoscript/Ice/bidir.py
+++ b/demoscript/Ice/bidir.py
@@ -9,34 +9,34 @@
# **********************************************************************
import sys, signal
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
+import Expect
def run(clientStr, server):
- print "adding client 1... ",
+ sys.stdout.write("adding client 1... ")
sys.stdout.flush()
client1 = Util.spawn(clientStr)
server.expect('adding client')
client1.expect('received callback #1')
- print "ok"
+ print("ok")
- print "adding client 2... ",
+ sys.stdout.write("adding client 2... ")
sys.stdout.flush()
client2 = Util.spawn(clientStr)
server.expect('adding client')
client1.expect('received callback #')
client2.expect('received callback #')
- print "ok"
+ print("ok")
- print "removing client 2...",
+ sys.stdout.write("removing client 2... ")
sys.stdout.flush()
client2.kill(signal.SIGINT)
client2.waitTestSuccess(timeout=20)
server.expect('removing client')
client1.expect('received callback #')
- print "ok"
+ print("ok")
- print "removing client 1...",
+ sys.stdout.write("removing client 1... ")
sys.stdout.flush()
client1.kill(signal.SIGINT)
client1.waitTestSuccess()
@@ -45,4 +45,4 @@ def run(clientStr, server):
server.kill(signal.SIGINT)
server.waitTestSuccess(timeout=30)
- print "ok"
+ print("ok")
diff --git a/demoscript/Ice/callback.py b/demoscript/Ice/callback.py
index 5e675161cec..9329fe5e362 100644
--- a/demoscript/Ice/callback.py
+++ b/demoscript/Ice/callback.py
@@ -9,11 +9,9 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
def run(client, server):
- print "testing...",
+ sys.stdout.write("testing... ")
sys.stdout.flush()
client.sendline('t')
@@ -24,7 +22,7 @@ def run(client, server):
server.expect('initiating callback')
client.expect('received callback')
- print "ok"
+ print("ok")
client.sendline('s')
server.waitTestSuccess()
diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py
index baa2210fc5d..990e9426f30 100644
--- a/demoscript/Ice/hello.py
+++ b/demoscript/Ice/hello.py
@@ -9,26 +9,25 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
+import Expect
def runtests(client, server, secure):
- print "testing twoway",
+ sys.stdout.write("testing twoway ")
sys.stdout.flush()
client.sendline('t')
server.expect('Hello World!')
- print "oneway",
+ sys.stdout.write("oneway ")
sys.stdout.flush()
client.sendline('o')
server.expect('Hello World!')
if not secure:
- print "datagram",
+ sys.stdout.write("datagram ")
sys.stdout.flush()
client.sendline('d')
server.expect('Hello World!')
- print "... ok"
+ print("... ok")
- print "testing batch oneway",
+ sys.stdout.write("testing batch oneway ")
sys.stdout.flush()
client.sendline('O')
try:
@@ -40,7 +39,7 @@ def runtests(client, server, secure):
server.expect('Hello World!')
server.expect('Hello World!')
if not secure:
- print "datagram",
+ sys.stdout.write("datagram ")
sys.stdout.flush()
client.sendline('D')
try:
@@ -51,9 +50,9 @@ def runtests(client, server, secure):
client.sendline('f')
server.expect('Hello World!')
server.expect('Hello World!')
- print "... ok"
+ print("... ok")
- print "testing timeout...",
+ sys.stdout.write("testing timeout... ")
sys.stdout.flush()
client.sendline('T')
client.sendline('P')
@@ -67,12 +66,12 @@ def runtests(client, server, secure):
client.sendline('t')
server.expect('Hello World!')
client.sendline('T')
- print "ok"
+ print("ok")
def run(client, server):
runtests(client, server, False)
- print "repeating tests with SSL"
+ print("repeating tests with SSL")
client.sendline('S')
diff --git a/demoscript/Ice/interleaved.py b/demoscript/Ice/interleaved.py
index a31204dd1d7..98df018a653 100644
--- a/demoscript/Ice/interleaved.py
+++ b/demoscript/Ice/interleaved.py
@@ -9,42 +9,40 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
def runseries(client):
- print "testing bytes..."
+ print("testing bytes...")
client.expect('==> ', timeout=240)
client.sendline('e')
client.expect('==> ', timeout=2000)
- print "echo: %s " % (client.before)
+ print("echo: %s " % (client.before))
- print "testing strings..."
+ print("testing strings...")
client.sendline('2')
client.expect('==> ', timeout=240)
client.sendline('e')
client.expect('==> ', timeout=2000)
- print "echo: %s " % (client.before)
+ print("echo: %s " % (client.before))
- print "testing structs with string..."
+ print("testing structs with string...")
client.sendline('3')
client.expect('==> ', timeout=240)
client.sendline('e')
client.expect('==> ', timeout=2000)
- print "echo: %s " % (client.before)
+ print("echo: %s " % (client.before))
- print "testing structs with two ints and double..."
+ print("testing structs with two ints and double...")
client.sendline('4')
client.expect('==> ', timeout=240)
client.sendline('e')
client.expect('==> ', timeout=2000)
- print "echo: %s " % (client.before)
+ print("echo: %s " % (client.before))
def run(client, server):
- print "testing with 2 outstanding requests\n"
+ print("testing with 2 outstanding requests\n")
runseries(client)
- print "testing with unlimited outstanding requests\n"
+ print("testing with unlimited outstanding requests\n")
client.sendline('o')
runseries(client)
diff --git a/demoscript/Ice/invoke.py b/demoscript/Ice/invoke.py
index 8120855930e..0b887c7147f 100644
--- a/demoscript/Ice/invoke.py
+++ b/demoscript/Ice/invoke.py
@@ -9,8 +9,7 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
def runDemo(client, server):
sys.stdout.flush()
@@ -45,7 +44,8 @@ def runDemo(client, server):
client.expect("Got string `hello' and class: s\\.name=green, s\\.value=green")
def run(clientStr, server):
- print "testing...",
+ sys.stdout.write("testing... ")
+ sys.stdout.flush()
client = Util.spawn(clientStr)
client.expect('==>')
@@ -56,4 +56,4 @@ def run(clientStr, server):
client.sendline('x')
client.waitTestSuccess()
- print "ok"
+ print("ok")
diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py
index 65c3167ef11..970e3b5410b 100644
--- a/demoscript/Ice/multicast.py
+++ b/demoscript/Ice/multicast.py
@@ -9,8 +9,8 @@
# **********************************************************************
import sys, signal
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
+import Expect
def runClient(clientCmd, server1, server2):
client = Util.spawn(clientCmd)
@@ -25,7 +25,7 @@ def runClient(clientCmd, server1, server2):
try:
server2.expect('Hello World!', 1)
received = True
- except Expect.TIMEOUT, e:
+ except Expect.TIMEOUT as e:
ex = e
pass
@@ -56,20 +56,20 @@ def runDemo(clientCmd, serverCmd):
server2.waitTestSuccess()
def run(clientCmd, serverCmd):
- print "testing multicast discovery (Ipv4)...",
+ sys.stdout.write("testing multicast discovery (IPv4)... ")
sys.stdout.flush()
if serverCmd.startswith("java"):
runDemo(clientCmd, "java -Djava.net.preferIPv4Stack=true Server")
else:
runDemo(clientCmd, serverCmd)
- print "ok"
+ print("ok")
if Util.getMapping() == "java" and Util.isWin32():
- print "skipping testing multicast discovery (IPv6) under windows...",
+ sys.stdout.write("skipping testing multicast discovery (IPv6) under Windows...")
else:
- print "testing multicast discovery (IPv6)...",
+ sys.stdout.write("testing multicast discovery (IPv6)... ")
sys.stdout.flush()
serverCmd += ' --Ice.IPv6=1 --Discover.Endpoints="udp -h \\"ff01::1:1\\" -p 10000"'
clientCmd += ' --Ice.IPv6=1 --Discover.Proxy="discover:udp -h \\"ff01::1:1\\" -p 10000"'
runDemo(clientCmd, serverCmd)
- print "ok"
+ print("ok")
diff --git a/demoscript/Ice/nested.py b/demoscript/Ice/nested.py
index 71c24788ab4..3a21738aa5a 100644
--- a/demoscript/Ice/nested.py
+++ b/demoscript/Ice/nested.py
@@ -9,11 +9,9 @@
# **********************************************************************
import sys, signal
-from demoscript import *
-from scripts import Expect
def run(client, server):
- print "testing nested...",
+ sys.stdout.write("testing nested... ")
sys.stdout.flush()
client.sendline('1')
server.expect('1')
@@ -24,16 +22,16 @@ def run(client, server):
client.sendline('3')
server.expect('3\n1')
client.expect('2\n.*for exit:')
- print "ok"
+ print("ok")
- print "testing blocking...",
+ sys.stdout.write("testing blocking... ")
sys.stdout.flush()
client.sendline('21') # This will cause a block.
server.expect('\n'.join(['13', '11', '9', '7', '5', '3']))
client.expect('\n'.join(['12', '10', '8', '6', '4', '2']))
client.expect('TimeoutException', timeout=3000)
server.expect('TimeoutException', timeout=3000)
- print "ok"
+ print("ok")
client.sendline('x')
client.waitTestSuccess()
diff --git a/demoscript/Ice/nrvo.py b/demoscript/Ice/nrvo.py
index 7c2e3e202d2..4dc2fc0d23d 100644
--- a/demoscript/Ice/nrvo.py
+++ b/demoscript/Ice/nrvo.py
@@ -9,11 +9,9 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
def run(client, server):
- print "testing client... ",
+ sys.stdout.write("testing client... ")
sys.stdout.flush()
client.sendline('1')
client.expect('==> ', timeout=2000)
@@ -24,4 +22,4 @@ def run(client, server):
client.sendline('s')
client.expect('==> ', timeout=2000)
client.sendline('x')
- print "ok"
+ print("ok")
diff --git a/demoscript/Ice/plugin.py b/demoscript/Ice/plugin.py
index e5222bbcc62..b41ff66c561 100644
--- a/demoscript/Ice/plugin.py
+++ b/demoscript/Ice/plugin.py
@@ -9,15 +9,13 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
def run(client, server):
- print "testing...",
+ sys.stdout.write("testing... ")
sys.stdout.flush()
client.sendline('t')
server.expect('PRINT: Hello World!')
- print "ok"
+ print("ok")
client.sendline('s')
server.waitTestSuccess()
diff --git a/demoscript/Ice/serialize.py b/demoscript/Ice/serialize.py
index 85cf6840441..583bbe9cca8 100644
--- a/demoscript/Ice/serialize.py
+++ b/demoscript/Ice/serialize.py
@@ -9,26 +9,24 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
def runtests(client, server, secure):
- print "testing greeting...",
+ sys.stdout.write("testing greeting... ")
sys.stdout.flush()
client.sendline('g')
server.expect('Hello there!')
client.sendline('g')
server.expect('Hello there!')
- print "ok"
+ print("ok")
- print "testing null greeting...",
+ sys.stdout.write("testing null greeting... ")
sys.stdout.flush()
client.sendline('t')
client.sendline('g')
server.expect('Received null greeting')
client.sendline('g')
server.expect('Received null greeting')
- print "ok"
+ print("ok")
def run(client, server):
runtests(client, server, False)
diff --git a/demoscript/Ice/session.py b/demoscript/Ice/session.py
index d43db35d312..f607db2dcde 100644
--- a/demoscript/Ice/session.py
+++ b/demoscript/Ice/session.py
@@ -9,15 +9,14 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
def run(clientStr, server):
client = Util.spawn(clientStr)
client.expect('==>')
client.sendline('foo')
- print "testing session creation...",
+ sys.stdout.write("testing session creation... ")
sys.stdout.flush()
server.expect('The session foo is now created.')
client.sendline('c')
@@ -28,9 +27,9 @@ def run(clientStr, server):
client.sendline('x')
client.waitTestSuccess()
server.expect("The session foo is now destroyed.")
- print "ok"
+ print("ok")
- print "testing session cleanup...",
+ sys.stdout.write("testing session cleanup... ")
sys.stdout.flush()
client = Util.spawn(clientStr)
client.expect('==>')
@@ -40,7 +39,7 @@ def run(clientStr, server):
client.sendline('t')
client.waitTestSuccess()
server.expect("The session foo is now destroyed.\n.*The session foo has timed out.", timeout=25)
- print "ok"
+ print("ok")
client = Util.spawn(clientStr)
client.expect('==>')
diff --git a/demoscript/Ice/throughput.py b/demoscript/Ice/throughput.py
index 4f1c14edd23..09dfdd943c7 100644
--- a/demoscript/Ice/throughput.py
+++ b/demoscript/Ice/throughput.py
@@ -9,43 +9,42 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
+from demoscript import Util
def runseries(client):
client.expect('==> ', timeout=240)
client.sendline('t')
client.expect('==> ', timeout=2000)
- print "twoway: %s " % (client.before)
+ print("twoway: %s " % (client.before))
if not Util.fast:
client.sendline('o')
client.expect('==> ', timeout=2000)
- print "oneway: %s " % (client.before)
+ print("oneway: %s " % (client.before))
client.sendline('r')
client.expect('==> ', timeout=2000)
- print "receive: %s" % (client.before)
+ print("receive: %s" % (client.before))
client.sendline('e')
client.expect('==> ', timeout=2000)
- print "echo: %s" % (client.before)
+ print("echo: %s" % (client.before))
def run(client, server):
- print "testing bytes"
+ print("testing bytes")
runseries(client)
- print "testing strings"
+ print("testing strings")
client.sendline('2')
runseries(client)
- print "testing structs with string... "
+ print("testing structs with string")
client.sendline('3')
runseries(client)
- print "testing structs with two ints and double... "
+ print("testing structs with two ints and double")
client.sendline('4')
runseries(client)
diff --git a/demoscript/Ice/value.py b/demoscript/Ice/value.py
index bb15cae2724..4c6577696d6 100644
--- a/demoscript/Ice/value.py
+++ b/demoscript/Ice/value.py
@@ -9,11 +9,9 @@
# **********************************************************************
import sys
-from demoscript import *
-from scripts import Expect
def run(client, server, ruby = False):
- print "testing...",
+ sys.stdout.write("testing... ")
sys.stdout.flush()
client.expect('press enter')
client.sendline('')
@@ -42,7 +40,7 @@ def run(client, server, ruby = False):
client.expect('==> a derived message 4 u\n==> A DERIVED MESSAGE 4 U.*press enter')
client.sendline('')
client.expect('==> a derived message 4 u\n==> A DERIVED MESSAGE 4 U')
- print "ok"
+ print("ok")
server.waitTestSuccess()
client.waitTestSuccess()
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:38:23 +0000