3 files changed, 71 insertions, 1 deletions
diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py
index a003b0c9598..a5a1624b9d3 100644
--- a/demoscript/Ice/hello.py
+++ b/demoscript/Ice/hello.py
@@ -59,7 +59,7 @@ def runtests(client, server, secure):
     client.sendline('P')
     client.expect('server delay is now set to 2500ms')
     client.sendline('t')
-    client.expect('.*TimeoutException.*', timeout=5)
+    client.expect('.*TimeoutException.*', timeout=10)
     server.expect('Hello World!')
     server.expect('Hello World!') # second because op is idempotent
     client.sendline('P')
diff --git a/demoscript/Ice/protobuf.py b/demoscript/Ice/protobuf.py
new file mode 100644
index 00000000000..23ad94fc48d
--- /dev/null
+++ b/demoscript/Ice/protobuf.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import sys
+from demoscript import *
+from scripts import Expect
+
+def run(client, server):
+    print "testing...",
+    sys.stdout.flush()
+    client.sendline('t')
+    server.expect('Hello World from id: 1')
+    server.expect('name: "Fred Jones"')
+    server.expect('email: "fred@jones.com"')
+    print "ok"
+
+    print "shutting down...",
+    client.sendline('s')
+    server.waitTestSuccess()
+
+    client.sendline('x')
+    client.waitTestSuccess()
+    print "ok"
diff --git a/demoscript/Ice/serialize.py b/demoscript/Ice/serialize.py
new file mode 100644
index 00000000000..77a3ca03d29
--- /dev/null
+++ b/demoscript/Ice/serialize.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import sys
+from demoscript import *
+from scripts import Expect
+
+def runtests(client, server, secure):
+    print "testing greeting...",
+    sys.stdout.flush()
+    client.sendline('g')
+    server.expect('Hello there!')
+    client.sendline('g')
+    server.expect('Hello there!')
+    print "ok"
+
+    print "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"
+
+def run(client, server):
+    runtests(client, server, False)
+
+    client.sendline('s')
+    server.waitTestSuccess()
+
+    client.sendline('x')
+    client.waitTestSuccess()