diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-11-15 09:37:16 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-11-15 09:37:16 +0000 |
| commit | e4b4561f5ebccca4257d5c0aed7c539c0f53969c (patch) | |
| tree | 6e3f00fc0af1588c670200a3e4268e5d552fb35a /cpp/config/IceGridAdmin.py | |
| parent | No -h in client-side endpoint means use loopback (diff) | |
| download | ice-e4b4561f5ebccca4257d5c0aed7c539c0f53969c.tar.bz2 ice-e4b4561f5ebccca4257d5c0aed7c539c0f53969c.tar.xz ice-e4b4561f5ebccca4257d5c0aed7c539c0f53969c.zip | |
Fix
Diffstat (limited to 'cpp/config/IceGridAdmin.py')
| -rw-r--r-- | cpp/config/IceGridAdmin.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/config/IceGridAdmin.py b/cpp/config/IceGridAdmin.py index 9bb3f64c9c6..b58aea0c4d4 100644 --- a/cpp/config/IceGridAdmin.py +++ b/cpp/config/IceGridAdmin.py @@ -15,7 +15,7 @@ from threading import Thread # Set nreplicas to a number N to test replication with N replicas. # nreplicas=0 -#nreplicas=2 +#nreplicas=3 for toplevel in [".", "..", "../..", "../../..", "../../../.."]: toplevel = os.path.normpath(toplevel) @@ -193,6 +193,12 @@ def killNodeServers(): def iceGridTest(name, application, additionalOptions = "", applicationOptions = ""): + if not TestUtil.isWin32() and os.getuid() == 0: + print + print "*** can't run test as root ***" + print + return + testdir = os.path.join(toplevel, "test", name) client = os.path.join(testdir, "client") @@ -200,7 +206,7 @@ def iceGridTest(name, application, additionalOptions = "", applicationOptions = startIceGridRegistry(testdir) iceGridNodePipe = startIceGridNode(testdir) - + if application != "": print "adding application...", iceGridAdmin('application add ' + os.path.join(testdir, application) + ' ' + \ |