Bug 4244 - simplify callback demo

1 files changed, 5 insertions, 46 deletions

diff --git a/demoscript/Ice/callback.py b/demoscript/Ice/callback.py
index 2a37edbaa6c..747d16490db 100644
--- a/demoscript/Ice/callback.py
+++ b/demoscript/Ice/callback.py
@@ -12,60 +12,19 @@ import sys
 from demoscript import *
 from scripts import Expect
 
-def runtests(client, server, secure):
-    print "testing twoway",
+def run(client, server):
+    print "testing...",
     sys.stdout.flush()
+
     client.sendline('t')
     server.expect('initiating callback')
     client.expect('received callback')
-    print "oneway",
-    sys.stdout.flush()
-    client.sendline('o')
-    server.expect('initiating callback')
-    client.expect('received callback')
-    if not secure:
-        print "datagram",
-        sys.stdout.flush()
-        client.sendline('d')
-        server.expect('initiating callback')
-        client.expect('received callback')
-    print "... ok"
 
-    print "testing batch oneway",
-    sys.stdout.flush()
-    client.sendline('O')
-    try:
-        server.expect('initiating callback', timeout=1)
-    except Expect.TIMEOUT:
-        pass
-    client.sendline('O')
-    client.sendline('f')
-    server.expect('initiating callback')
-    client.expect('received callback')
+    client.sendline('t')
     server.expect('initiating callback')
     client.expect('received callback')
-    if not secure:
-        print "datagram",
-        sys.stdout.flush()
-        client.sendline('D')
-        try:
-            server.expect('initiating callback', timeout=1)
-        except Expect.TIMEOUT:
-            pass
-        client.sendline('D')
-        client.sendline('f')
-        server.expect('initiating callback')
-        client.expect('received callback')
-        server.expect('initiating callback')
-        client.expect('received callback')
-    print "... ok"
-
-def run(client, server):
-    runtests(client, server, False)
 
-    print "repeating tests with SSL"
-    client.sendline('S')
-    runtests(client, server, True)
+    print "ok"
 
     client.sendline('s')
     server.waitTestSuccess()