summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/activation/test.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-05-05 18:05:00 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-05-05 18:05:00 +0200
commitce5d263ba2a22bf0e15323bd822dcb8f92f5fe6a (patch)
treed050f07b4ceb66bd6e99d428d800a50d62c00c7e /cpp/test/IceGrid/activation/test.py
parentMerge remote-tracking branch 'origin/3.6' (diff)
downloadice-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/activation/test.py')
-rw-r--r--cpp/test/IceGrid/activation/test.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/test/IceGrid/activation/test.py b/cpp/test/IceGrid/activation/test.py
index 96c617c31c1..1bcb3ae9f32 100644
--- a/cpp/test/IceGrid/activation/test.py
+++ b/cpp/test/IceGrid/activation/test.py
@@ -8,4 +8,5 @@
#
# **********************************************************************
-TestSuite(__file__, [IceGridTestCase()], multihost=False) \ No newline at end of file
+if isinstance(platform, Windows) or os.getuid() != 0:
+ TestSuite(__file__, [IceGridTestCase()], multihost=False)