diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-05 18:05:00 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-05 18:05:00 +0200 |
| commit | ce5d263ba2a22bf0e15323bd822dcb8f92f5fe6a (patch) | |
| tree | d050f07b4ceb66bd6e99d428d800a50d62c00c7e /cpp/test/IceGrid/session/test.py | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-ce5d263ba2a22bf0e15323bd822dcb8f92f5fe6a.tar.bz2 ice-ce5d263ba2a22bf0e15323bd822dcb8f92f5fe6a.tar.xz ice-ce5d263ba2a22bf0e15323bd822dcb8f92f5fe6a.zip | |
Skip IceGrid tests which don't support running as root when running as root
Diffstat (limited to 'cpp/test/IceGrid/session/test.py')
| -rw-r--r-- | cpp/test/IceGrid/session/test.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/test/IceGrid/session/test.py b/cpp/test/IceGrid/session/test.py index e35012c8919..108f6cea753 100644 --- a/cpp/test/IceGrid/session/test.py +++ b/cpp/test/IceGrid/session/test.py @@ -52,7 +52,8 @@ clientProps10 = lambda process, current: { icegridregistry = [IceGridRegistryMaster(props=registryProps)] -TestSuite(__file__, +if isinstance(platform, Windows) or os.getuid() != 0: + TestSuite(__file__, [ IceGridSessionTestCase("with default encoding", icegridregistry=icegridregistry, client=IceGridClient(props=clientProps)), IceGridSessionTestCase("with 1.0 encoding", icegridregistry=icegridregistry, |