[tor-commits] [stem/master] Skipping tests that make repeated connections on OSX

[atagar at torproject.org]

commit 48404ed766a775b2d958d9b4b686e96cc88914c0
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Jul 7 19:55:24 2012 -0700

    Skipping tests that make repeated connections on OSX
    
    Stem's tests currently hang on Mac OSX, and that doesn't look to be getting
    better any time soon...
    https://trac.torproject.org/5917
    
    I've narrowd this down to being either a python, tor, or mac bug with how
    repeated socket connection/closures are handled on that platform. For now
    skipping the tests that encounter this issue if we're running on a mac.
---
 test/integ/control/base_controller.py |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py
index d74c160..4104075 100644
--- a/test/integ/control/base_controller.py
+++ b/test/integ/control/base_controller.py
@@ -11,6 +11,7 @@ import threading
 
 import stem.control
 import stem.socket
+import stem.util.system
 import test.runner
 
 class StateObserver:
@@ -41,6 +42,9 @@ class TestBaseController(unittest.TestCase):
     """
     
     if test.runner.require_control(self): return
+    elif stem.util.system.is_mac():
+      test.runner.skip(self, "(ticket #6235)")
+      return
     
     with test.runner.get_runner().get_tor_socket() as control_socket:
       controller = stem.control.BaseController(control_socket)
@@ -91,6 +95,9 @@ class TestBaseController(unittest.TestCase):
     """
     
     if test.runner.require_control(self): return
+    elif stem.util.system.is_mac():
+      test.runner.skip(self, "(ticket #6235)")
+      return
     
     with test.runner.get_runner().get_tor_socket() as control_socket:
       controller = stem.control.BaseController(control_socket)