[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

Gerhard Lausser gerhard.lausser at consol.de
Tue Feb 28 22:21:54 UTC 2012


The following commit has been merged in the debian/master branch:
commit 5c0792121860ed9ebe632d2b54dfd433e3d36367
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Sun Feb 19 16:49:54 2012 +0100

    Prevent a pipe-test from running under cygwin. Otherwise it will hang

diff --git a/test/test_module_named_pipe_arbiter.py b/test/test_module_named_pipe_arbiter.py
index d7e67ac..55f2254 100755
--- a/test/test_module_named_pipe_arbiter.py
+++ b/test/test_module_named_pipe_arbiter.py
@@ -23,7 +23,7 @@
 # This file is used to test reading and processing of config files
 #
 
-import os, sys, time
+import os, sys, time, platform
 
 from shinken_test import unittest, ShinkenTest
 
@@ -49,7 +49,8 @@ class TestModuleNamedPipe(ShinkenTest):
     def test_read_named_pipe(self):
 
         # Ok, windows do not have named pipe, we know...
-        if os.name == 'nt':
+        # cygwin cannow write from two sides at the same time
+        if os.name == 'nt' or platform.system().startswith('CYGWIN'):
             return
 
         now = int(time.time())

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list