diff options
| author | Joe George <joe@zeroc.com> | 2018-04-09 14:45:01 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2018-04-09 14:45:01 -0400 |
| commit | 0a37d62cd9ce62de708f685cfa0fc30058ab83ac (patch) | |
| tree | 05d42719daf7b3ca0f919406b2f3ac407691ff94 /scripts/tests/IceGrid/simple.py | |
| parent | Fix typo (diff) | |
| download | ice-0a37d62cd9ce62de708f685cfa0fc30058ab83ac.tar.bz2 ice-0a37d62cd9ce62de708f685cfa0fc30058ab83ac.tar.xz ice-0a37d62cd9ce62de708f685cfa0fc30058ab83ac.zip | |
ICE-8813 - Skip some IceGrid tests when root user
Diffstat (limited to 'scripts/tests/IceGrid/simple.py')
| -rw-r--r-- | scripts/tests/IceGrid/simple.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/scripts/tests/IceGrid/simple.py b/scripts/tests/IceGrid/simple.py index d17567bfb7c..5b46ed37003 100644 --- a/scripts/tests/IceGrid/simple.py +++ b/scripts/tests/IceGrid/simple.py @@ -32,14 +32,15 @@ clientTraceProps = { "IceLocatorDiscovery.Trace.Lookup" : 3 } outfilters = [ lambda x: re.sub("-! .* warning: .*failed to lookup locator.*\n", "", x), lambda x: re.sub("^ .*\n", "", x) ] -TestSuite(__name__, [ - IceGridTestCase("without deployment", application=None, - icegridregistry=[IceGridRegistryMaster(props=registryProps, traceProps=registryTraceProps), - IceGridRegistrySlave(1, props=registryProps, traceProps=registryTraceProps), - IceGridRegistrySlave(2, props=registryProps, traceProps=registryTraceProps)], - client=ClientServerTestCase(client=IceGridClient(props=clientProps, - outfilters=outfilters, - traceProps=clientTraceProps), - server=IceGridServer(props=serverProps))), - IceGridTestCase("with deployment", client=IceGridClient(args=["--with-deploy"])) -], multihost=False) +if os.getuid() != 0: + TestSuite(__name__, [ + IceGridTestCase("without deployment", application=None, + icegridregistry=[IceGridRegistryMaster(props=registryProps, traceProps=registryTraceProps), + IceGridRegistrySlave(1, props=registryProps, traceProps=registryTraceProps), + IceGridRegistrySlave(2, props=registryProps, traceProps=registryTraceProps)], + client=ClientServerTestCase(client=IceGridClient(props=clientProps, + outfilters=outfilters, + traceProps=clientTraceProps), + server=IceGridServer(props=serverProps))), + IceGridTestCase("with deployment", client=IceGridClient(args=["--with-deploy"])) + ], multihost=False) |