2 files changed, 34 insertions, 1 deletions
diff --git a/cs/demo/Ice/async/Client.cs b/cs/demo/Ice/async/Client.cs
index ea7ab3aed85..e1149f464fe 100644
--- a/cs/demo/Ice/async/Client.cs
+++ b/cs/demo/Ice/async/Client.cs
@@ -22,7 +22,7 @@ public class Client : Ice.Application
         {
             if(ex is RequestCanceledException)
             {
-                Console.Error.WriteLine("Request canceled");
+                Console.Error.WriteLine("RequestCanceledException");
             }
             else
             {
diff --git a/cs/demo/Ice/async/expect.py b/cs/demo/Ice/async/expect.py
new file mode 100755
index 00000000000..2076b186786
--- /dev/null
+++ b/cs/demo/Ice/async/expect.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2007 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 pexpect, sys, os
+
+try:
+    import demoscript
+except ImportError:
+    for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
+        toplevel = os.path.normpath(toplevel)
+        if os.path.exists(os.path.join(toplevel, "demoscript")):
+            break
+    else:
+        raise "can't find toplevel directory!"
+    sys.path.append(os.path.join(toplevel))
+    import demoscript
+
+import demoscript.Util
+import demoscript.Ice.async
+
+server = demoscript.Util.spawn('%sserver.exe --Ice.PrintAdapterReady' % (demoscript.Util.mono()))
+server.expect('.* ready')
+client = demoscript.Util.spawn('%sclient.exe' % (demoscript.Util.mono()))
+client.expect('.*==>')
+
+demoscript.Ice.async.run(client, server)