1 files changed, 16 insertions, 34 deletions
diff --git a/demoscript/IceGrid/simple.py b/demoscript/IceGrid/simple.py
index 1def7dc500b..5f637f46b05 100755
--- a/demoscript/IceGrid/simple.py
+++ b/demoscript/IceGrid/simple.py
@@ -82,40 +82,22 @@ def run(clientStr, desc = 'application'):
     print "testing client...", 
     sys.stdout.flush()
 
-    admin.sendline('server start SimpleServer-1')
-
-    client = demoscript.Util.spawn(clientStr)
-    client.expect('==>')
-    client.sendline('t')
-    node.expect("SimpleServer-1 says Hello World!")
-    client.sendline('t')
-    node.expect("SimpleServer-1 says Hello World!")
-    client.sendline('s')
-    node.expect("detected termination of.*SimpleServer-1")
-    client.sendline('x')
-    client.waitTestSuccess(timeout=1)
-
-    client = demoscript.Util.spawn(clientStr)
-    client.expect('==>')
-    client.sendline('t')
-    node.expect("SimpleServer-2 says Hello World!")
-    client.sendline('t')
-    node.expect("SimpleServer-2 says Hello World!")
-    client.sendline('s')
-    node.expect("detected termination of.*SimpleServer-2")
-    client.sendline('x')
-    client.waitTestSuccess(timeout=1)
-
-    client = demoscript.Util.spawn(clientStr)
-    client.expect('==>')
-    client.sendline('t')
-    node.expect("SimpleServer-3 says Hello World!")
-    client.sendline('t')
-    node.expect("SimpleServer-3 says Hello World!")
-    client.sendline('s')
-    node.expect("detected termination of.*SimpleServer-3")
-    client.sendline('x')
-    client.waitTestSuccess(timeout=1)
+    def testserver(which):
+        admin.sendline('server start SimpleServer-%d' % which)
+        admin.expect('>>> ')
+        client = demoscript.Util.spawn(clientStr)
+        client.expect('==>')
+        client.sendline('t')
+        node.expect("SimpleServer-%d says Hello World!" % which)
+        client.sendline('t')
+        node.expect("SimpleServer-%d says Hello World!" % which)
+        client.sendline('s')
+        node.expect("detected termination of.*SimpleServer-%d" % which)
+        client.sendline('x')
+        client.waitTestSuccess(timeout=1)
+    testserver(1)
+    testserver(2)
+    testserver(3)
 
     print "ok"