1 files changed, 25 insertions, 34 deletions
diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py
index 4c431d7167b..c4363002259 100755
--- a/cpp/demo/IceGrid/secure/expect.py
+++ b/cpp/demo/IceGrid/secure/expect.py
@@ -10,42 +10,33 @@
 
 import 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
-demoscript.Util.defaultLanguage = "C++"
-
+path = [ ".", "..", "../..", "../../..", "../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "demoscript")) ]
+if len(path) == 0:
+    raise "can't find toplevel directory!"
+sys.path.append(path[0])
+
+from demoscript import *
 import signal
 
 print "cleaning databases...",
 sys.stdout.flush()
-demoscript.Util.cleanDbDir("db/registry")
-demoscript.Util.cleanDbDir("db/node")
-demoscript.Util.cleanDbDir("certs")
+Util.cleanDbDir("db/registry")
+Util.cleanDbDir("db/node")
+Util.cleanDbDir("certs")
 print "ok"
 
-if demoscript.Util.defaultHost:
+if Util.defaultHost:
     args = ' --IceGrid.Node.PropertiesOverride="Ice.Default.Host=127.0.0.1"'
 else:
     args = ''
 
-# If this is cygwin add the location of the real python to the PATH.
-if demoscript.Util.isCygwin():
-    os.environ["PATH"] = demoscript.Util.pythonhome + os.pathsep + os.environ["PATH"]
-
 print "creating certificates...",
 sys.stdout.flush()
-makecerts = demoscript.Util.spawn('python makecerts.py')
+makecerts = Util.spawn('python -u makecerts.py')
 makecerts.expect("Do you want to keep this as the CA subject name?")
 makecerts.sendline("y")
 makecerts.expect("Enter the email address of the CA:")
@@ -73,9 +64,9 @@ print "starting icegrid...",
 sys.stdout.flush()
 registryProps = " --Ice.PrintAdapterReady" + \
                 " --IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier"
-registry = demoscript.Util.spawn('icegridregistry --Ice.Config=config.registry' + registryProps)
-registry.expect('IceGrid.Registry.Internal ready\r{1,2}\nIceGrid.Registry.Server ready\r{1,2}\nIceGrid.Registry.Client ready')
-node = demoscript.Util.spawn('icegridnode --Ice.Config=config.node --Ice.PrintAdapterReady %s' % (args))
+registry = Util.spawn('icegridregistry --Ice.Config=config.registry' + registryProps)
+registry.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready')
+node = Util.spawn('icegridnode --Ice.Config=config.node --Ice.PrintAdapterReady %s' % (args))
 node.expect('IceGrid.Node ready')
 print "ok"
 
@@ -85,14 +76,14 @@ sys.stdout.flush()
 glacier2Props = " --Ice.PrintAdapterReady --Glacier2.SessionTimeout=5" + \
                 " --Glacier2.SSLSessionManager=DemoIceGrid/AdminSSLSessionManager" + \
                 " --Glacier2.SSLPermissionsVerifier=DemoGlacier2/NullSSLPermissionsVerifier"
-glacier2 = demoscript.Util.spawn('glacier2router --Ice.Config=config.glacier2' + glacier2Props)
+glacier2 = Util.spawn('glacier2router --Ice.Config=config.glacier2' + glacier2Props)
 glacier2.expect('Glacier2.Client ready')
 glacier2.expect('Glacier2.Server ready')
 print "ok"
 
 print "deploying application...",
 sys.stdout.flush()
-admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin')
+admin = Util.spawn('icegridadmin --Ice.Config=config.admin')
 admin.expect('>>>')
 admin.sendline("application add application.xml")
 admin.expect('>>>')
@@ -101,7 +92,7 @@ admin.waitTestSuccess(timeout=120)
 print "ok"
 
 def runtest():
-    client = demoscript.Util.spawn('./client')
+    client = Util.spawn('./client')
     client.expect('==>')
     client.sendline('t')
     node.expect("SimpleServer says Hello World!")
@@ -121,7 +112,7 @@ print "ok"
 print "testing icegridadmin...",
 sys.stdout.flush()
 
-admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin --Ice.Default.Router="DemoGlacier2/router:ssl -p 4064"')
+admin = Util.spawn('icegridadmin --Ice.Config=config.admin --Ice.Default.Router="DemoGlacier2/router:ssl -p 4064"')
 admin.expect('>>>')
 admin.sendline("server list")
 admin.expect('SimpleServer')
@@ -129,7 +120,7 @@ admin.expect('>>>')
 admin.sendline('exit')
 admin.waitTestSuccess(timeout=120)
 
-admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin --ssl')
+admin = Util.spawn('icegridadmin --Ice.Config=config.admin --ssl')
 admin.expect('>>>')
 admin.sendline("server list")
 admin.expect('SimpleServer')
@@ -137,7 +128,7 @@ admin.expect('>>>')
 admin.sendline('exit')
 admin.waitTestSuccess(timeout=120)
 
-admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin --ssl --Ice.Default.Router="DemoGlacier2/router:ssl -p 4064"')
+admin = Util.spawn('icegridadmin --Ice.Config=config.admin --ssl --Ice.Default.Router="DemoGlacier2/router:ssl -p 4064"')
 admin.expect('>>>')
 admin.sendline("server list")
 admin.expect('SimpleServer')
@@ -150,7 +141,7 @@ print "ok"
 print "completing shutdown...", 
 sys.stdout.flush()
 
-admin = demoscript.Util.spawn('icegridadmin --Ice.Config=config.admin')
+admin = Util.spawn('icegridadmin --Ice.Config=config.admin')
 admin.expect('>>>')
 
 admin.sendline('node shutdown Node')