diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/IceGridAdmin.py | 10 | ||||
| -rwxr-xr-x | cpp/test/IceGrid/session/run.py | 6 |
2 files changed, 14 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) + ' ' + \ diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py index 328a337a411..894737d7c02 100755 --- a/cpp/test/IceGrid/session/run.py +++ b/cpp/test/IceGrid/session/run.py @@ -21,6 +21,12 @@ sys.path.append(os.path.join(toplevel, "config")) import TestUtil import IceGridAdmin +if not TestUtil.isWin32() and os.getuid() == 0: + print + print "*** can't run test as root ***" + print + sys.exit(0) + name = os.path.join("IceGrid", "session") testdir = os.path.join(toplevel, "test", name) |