From 09b2016c050defae8f087166fcca51deff7064f5 Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Wed, 19 Mar 2014 19:21:23 +0000 Subject: [PATCH] TST: Skip SYSLOG log target test if '/dev/log' not present Conflicts: testcases/servertestcase.py -- probably jumped over another commit in this cherry-pick which resulted in conflict --- testcases/servertestcase.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testcases/servertestcase.py b/testcases/servertestcase.py index 660109d5..d10057ff 100644 --- a/testcases/servertestcase.py +++ b/testcases/servertestcase.py @@ -513,8 +513,13 @@ class TransmitterLogging(TransmitterBase): self.setGetTest("logtarget", "STDOUT") self.setGetTest("logtarget", "STDERR") - if sys.platform.lower().startswith('linux'): - self.setGetTest("logtarget", "SYSLOG") + + def testLogTargetSYSLOG(self): + if not os.path.exists("/dev/log") and sys.version_info >= (2, 7): + raise unittest.SkipTest("'/dev/log' not present") + elif not os.path.exists("/dev/log"): + return + self.setGetTest("logtarget", "SYSLOG") def testLogLevel(self): self.setGetTest("loglevel", "4", 4)