Browse Source

[master] skip test cases that rely on select.poll. it's not always available.

this is an urgent care fix to #3014; we'll need cleaner solution (I
suggest #2690), but we should keep the master branch testable at least
for all developers and buildbots.
JINMEI Tatuya 12 years ago
parent
commit
6d1d496ef0
1 changed files with 5 additions and 0 deletions
  1. 5 0
      src/bin/msgq/tests/msgq_test.py

+ 5 - 0
src/bin/msgq/tests/msgq_test.py

@@ -19,6 +19,7 @@ from msgq import SubscriptionManager, MsgQ
 import unittest
 import unittest
 import os
 import os
 import socket
 import socket
+import select # needed only for #3014. can be removed once it's solved
 import signal
 import signal
 import sys
 import sys
 import time
 import time
@@ -273,6 +274,8 @@ class MsgQTest(unittest.TestCase):
         sock = Sock(1)
         sock = Sock(1)
         return notifications, sock
         return notifications, sock
 
 
+    @unittest.skipUnless('POLLIN' in select.__dict__,
+                         'cannot perform tests requiring select.poll')
     def test_notifies(self):
     def test_notifies(self):
         """
         """
         Test the message queue sends notifications about connecting,
         Test the message queue sends notifications about connecting,
@@ -312,6 +315,8 @@ class MsgQTest(unittest.TestCase):
         self.__msgq.kill_socket(sock.fileno(), sock)
         self.__msgq.kill_socket(sock.fileno(), sock)
         self.assertEqual([('disconnected', {'client': lname})], notifications)
         self.assertEqual([('disconnected', {'client': lname})], notifications)
 
 
+    @unittest.skipUnless('POLLIN' in select.__dict__,
+                         'cannot perform tests requiring select.poll')
     def test_notifies_implicit_kill(self):
     def test_notifies_implicit_kill(self):
         """
         """
         Test that the unsubscription notifications are sent before the socket
         Test that the unsubscription notifications are sent before the socket