summaryrefslogtreecommitdiff
path: root/demoscript/Ice
diff options
context:
space:
mode:
Diffstat (limited to 'demoscript/Ice')
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/__init__.py2
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/async.py3
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/bidir.py3
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/callback.py3
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/hello.py11
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/invoke.py5
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/multicast.py3
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/nested.py3
-rw-r--r--demoscript/Ice/nrvo.py27
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/session.py3
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/throughput.py3
-rw-r--r--[-rwxr-xr-x]demoscript/Ice/value.py3
12 files changed, 50 insertions, 19 deletions
diff --git a/demoscript/Ice/__init__.py b/demoscript/Ice/__init__.py
index 399e651aea7..e50b0733d5f 100755..100644
--- a/demoscript/Ice/__init__.py
+++ b/demoscript/Ice/__init__.py
@@ -1,6 +1,6 @@
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
diff --git a/demoscript/Ice/async.py b/demoscript/Ice/async.py
index 10c6b48ac63..0e3b054ef14 100755..100644
--- a/demoscript/Ice/async.py
+++ b/demoscript/Ice/async.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
@@ -10,6 +10,7 @@
import sys
from demoscript import *
+from scripts import Expect
def run(client, server):
print "testing client... ",
diff --git a/demoscript/Ice/bidir.py b/demoscript/Ice/bidir.py
index 7a8ab56a1de..c571ddc0d8a 100755..100644
--- a/demoscript/Ice/bidir.py
+++ b/demoscript/Ice/bidir.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
@@ -10,6 +10,7 @@
import sys, signal
from demoscript import *
+from scripts import Expect
def run(clientStr, server):
print "adding client 1... ",
diff --git a/demoscript/Ice/callback.py b/demoscript/Ice/callback.py
index 59facf278e9..2a37edbaa6c 100755..100644
--- a/demoscript/Ice/callback.py
+++ b/demoscript/Ice/callback.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
@@ -10,6 +10,7 @@
import sys
from demoscript import *
+from scripts import Expect
def runtests(client, server, secure):
print "testing twoway",
diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py
index aa6b7bb0d32..a003b0c9598 100755..100644
--- a/demoscript/Ice/hello.py
+++ b/demoscript/Ice/hello.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
@@ -10,6 +10,7 @@
import sys
from demoscript import *
+from scripts import Expect
def runtests(client, server, secure):
print "testing twoway",
@@ -58,13 +59,7 @@ def runtests(client, server, secure):
client.sendline('P')
client.expect('server delay is now set to 2500ms')
client.sendline('t')
- # With Java/C# under Windows the tcp connection shutdown takes
- # longer than expected... hence we use a 6 second timeout instead
- # of the expected ~4s.
- #
- # http://bugzilla/bugzilla/show_bug.cgi?id=2425
- #
- client.expect('.*TimeoutException.*', timeout=6)
+ client.expect('.*TimeoutException.*', timeout=5)
server.expect('Hello World!')
server.expect('Hello World!') # second because op is idempotent
client.sendline('P')
diff --git a/demoscript/Ice/invoke.py b/demoscript/Ice/invoke.py
index be7ad5424ed..0953b53ae27 100755..100644
--- a/demoscript/Ice/invoke.py
+++ b/demoscript/Ice/invoke.py
@@ -1,15 +1,16 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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, demoscript
+import sys
from demoscript import *
+from scripts import Expect
def run(client, server):
print "testing...",
diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py
index a1f0c3a04e3..deec2b0510e 100755..100644
--- a/demoscript/Ice/multicast.py
+++ b/demoscript/Ice/multicast.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
@@ -10,6 +10,7 @@
import sys, signal
from demoscript import *
+from scripts import Expect
def runClient(clientCmd, server1, server2):
client = Util.spawn(clientCmd)
diff --git a/demoscript/Ice/nested.py b/demoscript/Ice/nested.py
index 4c67f7e346b..8b739a4bbad 100755..100644
--- a/demoscript/Ice/nested.py
+++ b/demoscript/Ice/nested.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
@@ -10,6 +10,7 @@
import sys, signal
from demoscript import *
+from scripts import Expect
def run(client, server):
print "testing nested...",
diff --git a/demoscript/Ice/nrvo.py b/demoscript/Ice/nrvo.py
new file mode 100644
index 00000000000..32b6dbca451
--- /dev/null
+++ b/demoscript/Ice/nrvo.py
@@ -0,0 +1,27 @@
+#!/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 client... ",
+ sys.stdout.flush()
+ client.sendline('1')
+ client.expect('==> ', timeout=2000)
+ client.sendline('2')
+ client.expect('==> ', timeout=2000)
+ client.sendline('3')
+ client.expect('==> ', timeout=2000)
+ client.sendline('s')
+ client.expect('==> ', timeout=2000)
+ client.sendline('x')
+ print "ok"
diff --git a/demoscript/Ice/session.py b/demoscript/Ice/session.py
index 1d9ae3992eb..5b330dc48a6 100755..100644
--- a/demoscript/Ice/session.py
+++ b/demoscript/Ice/session.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
@@ -10,6 +10,7 @@
import sys
from demoscript import *
+from scripts import Expect
def run(clientStr, server):
client = Util.spawn(clientStr)
diff --git a/demoscript/Ice/throughput.py b/demoscript/Ice/throughput.py
index 5b812b439d0..166bfcab1b5 100755..100644
--- a/demoscript/Ice/throughput.py
+++ b/demoscript/Ice/throughput.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
@@ -10,6 +10,7 @@
import sys
from demoscript import *
+from scripts import Expect
def runseries(client):
client.expect('==> ', timeout=240)
diff --git a/demoscript/Ice/value.py b/demoscript/Ice/value.py
index 7db2275e7ee..9c7c50d0d54 100755..100644
--- a/demoscript/Ice/value.py
+++ b/demoscript/Ice/value.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# 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.
@@ -10,6 +10,7 @@
import sys
from demoscript import *
+from scripts import Expect
def run(client, server, ruby = False):
print "testing...",
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-06 05:38:45 +0000