Fixed eventlet tests

beltran · beltran · commit 22571afaea37 · 2017-10-16T16:38:14.000-04:00
diff --git a/tests/unit/io/test_eventletreactor.py b/tests/unit/io/test_eventletreactor.py
@@ -28,16 +28,17 @@
 except ImportError:
     EventletConnection = None  # noqa
 
+skip_condition = EventletConnection is None or MONKEY_PATCH_LOOP != "eventlet"
 # There are some issues with some versions of pypy and eventlet
 @notpypy
-@unittest.skipIf(EventletConnection is None, "Skpping the eventlet tests because it's not installed")
+@unittest.skipIf(skip_condition, "Skipping the eventlet tests because it's not installed")
 @notmonkeypatch
 class EventletTimerTest(unittest.TestCase, TimerConnectionTests):
     @classmethod
     def setUpClass(cls):
         # This is run even though the class is skipped, so we need
         # to make sure no monkey patching is happening
-        if not MONKEY_PATCH_LOOP:
+        if skip_condition:
             return
 
         # This is being added temporarily due to a bug in eventlet:
diff --git a/tests/unit/io/test_geventreactor.py b/tests/unit/io/test_geventreactor.py
@@ -27,14 +27,15 @@
     GeventConnection = None  # noqa
 
 
-@unittest.skipIf(GeventConnection is None, "Skpping the gevent tests because it's not installed")
+skip_condition = GeventConnection is None or MONKEY_PATCH_LOOP != "gevent"
+@unittest.skipIf(skip_condition, "Skipping the gevent tests because it's not installed")
 @notmonkeypatch
 class GeventTimerTest(unittest.TestCase, TimerConnectionTests):
     @classmethod
     def setUpClass(cls):
         # This is run even though the class is skipped, so we need
         # to make sure no monkey patching is happening
-        if not MONKEY_PATCH_LOOP:
+        if skip_condition:
             return
         gevent.monkey.patch_all()
         cls.connection_class = GeventConnection
diff --git a/tests/unit/test_cluster.py b/tests/unit/test_cluster.py
@@ -377,11 +377,11 @@ def test_warning_on_no_lbp_with_contact_points(self):
         @test_category configuration
         """
         with patch('cassandra.cluster.log') as patched_logger:
-            Cluster(contact_points=['1'])
+            Cluster(contact_points=['127.0.0.1'])
         patched_logger.warn.assert_called_once()
         warning_message = patched_logger.warn.call_args[0][0]
         self.assertIn('no load_balancing_policy', warning_message)
-        self.assertIn("contact_points = ['1']", warning_message)
+        self.assertIn("contact_points = ['127.0.0.1']", warning_message)
         self.assertIn('lbp = None', warning_message)
 
     @mock_session_pools
@@ -397,5 +397,5 @@ def test_no_warning_on_contact_points_with_lbp(self):
         @test_category configuration
         """
         with patch('cassandra.cluster.log') as patched_logger:
-            Cluster(contact_points=['1'], load_balancing_policy=object())
+            Cluster(contact_points=['127.0.0.1'], load_balancing_policy=object())
         patched_logger.warn.assert_not_called()
