1 files changed, 8 insertions, 8 deletions
diff --git a/demoscript/Glacier2/callback.py b/demoscript/Glacier2/callback.py
index 7ef1b36a2f5..eee21e8b538 100755
--- a/demoscript/Glacier2/callback.py
+++ b/demoscript/Glacier2/callback.py
@@ -26,14 +26,14 @@ def run(client, server, glacier2):
     client.sendline('t')
     server.expect('initiating callback to')
     client.expect('received callback')
-    #glacier2.expect('_fwd/t \\]')
+    glacier2.expect('_fwd/t')
 
     print "oneway",
     sys.stdout.flush()
     client.sendline('o')
     server.expect('initiating callback to')
     client.expect('received callback')
-    #glacier2.expect('_fwd/o \\]')
+    glacier2.expect('_fwd/o')
 
     print "batch",
     sys.stdout.flush()
@@ -44,14 +44,14 @@ def run(client, server, glacier2):
         pass
     client.sendline('O')
     client.sendline('f')
-    #glacier2.expect('_fwd/O \\]')
+    glacier2.expect('_fwd/O')
     print "ok"
 
     print "testing override context field...",
     sys.stdout.flush()
     client.sendline('v')
     client.sendline('t')
-    #glacier2.expect('_fwd/t, _ovrd/some_value')
+    glacier2.expect('_fwd/t, _ovrd/some_value')
     server.expect('initiating callback to')
     client.expect('received callback')
     print "ok"
@@ -68,13 +68,13 @@ def run(client, server, glacier2):
         pass
     print "ok"
 
+    client.sendline('s')
+    server.expect('shutting down...')
+    server.waitTestSuccess()
 
-    # SessionNotExist
     client.sendline('x')
+    glacier2.expect('destroying session')
     client.waitTestSuccess()
 
-    server.kill(signal.SIGINT)
-    server.waitTestSuccess()
-
     glacier2.kill(signal.SIGINT)
     glacier2.waitTestSuccess()