Merge "[py313-threading]Skip eventlet specific tests"

Author: Zuul

nova/tests/unit/test_rpc.py

@@ -22,6 +22,7 @@
 from nova import context
 from nova import rpc
 from nova import test
+from nova import utils
 
 CONF = nova.conf.CONF
 
@@ -245,31 +246,9 @@ def test_get_server(self, mock_get, mock_ser, mock_TRANSPORT):
 
         mock_ser.assert_called_once_with('foo')
         access_policy = dispatcher.DefaultRPCAccessPolicy
+        exc = 'threading' if utils.concurrency_mode_threading() else 'eventlet'
         mock_get.assert_called_once_with(mock_TRANSPORT, tgt, ends,
-                                         executor='eventlet', serializer=ser,
-                                         access_policy=access_policy)
-        self.assertEqual('server', server)
-
-    @mock.patch(
-        'nova.utils.concurrency_mode_threading',
-        new=mock.Mock(return_value=True))
-    @mock.patch.object(rpc, 'TRANSPORT')
-    @mock.patch.object(rpc, 'profiler', None)
-    @mock.patch.object(rpc, 'RequestContextSerializer')
-    @mock.patch.object(messaging, 'get_rpc_server')
-    def test_get_server_threading(self, mock_get, mock_ser, mock_TRANSPORT):
-        ser = mock.Mock()
-        tgt = mock.Mock()
-        ends = mock.Mock()
-        mock_ser.return_value = ser
-        mock_get.return_value = 'server'
-
-        server = rpc.get_server(tgt, ends, serializer='foo')
-
-        mock_ser.assert_called_once_with('foo')
-        access_policy = dispatcher.DefaultRPCAccessPolicy
-        mock_get.assert_called_once_with(mock_TRANSPORT, tgt, ends,
-                                         executor='threading', serializer=ser,
+                                         executor=exc, serializer=ser,
                                          access_policy=access_policy)
         self.assertEqual('server', server)
 

nova/tests/unit/test_utils.py

@@ -1578,6 +1578,12 @@ def _task_running(self):
         utils, 'concurrency_mode_threading', new=mock.Mock(return_value=False))
     @mock.patch.object(utils.LOG, 'debug')
     def test_stats_logged_eventlet(self, mock_debug):
+        env = os.environ.get('OS_NOVA_DISABLE_EVENTLET_PATCHING', '').lower()
+        if env in ('1', 'true', 'yes'):
+            self.skipTest(
+                "In native threading mode this case is covered by "
+                "test_stats_logged_threading")
+
         # ensure that each task submission triggers stats printing
         self.flags(thread_pool_statistic_period=0)
 
@@ -1613,6 +1619,11 @@ def cleanup():
         utils, 'concurrency_mode_threading', new=mock.Mock(return_value=True))
     @mock.patch.object(utils.LOG, 'debug')
     def test_stats_logged_threading(self, mock_debug):
+        if not utils.concurrency_mode_threading():
+            self.skipTest(
+                "In eventlet mode this case is covered by "
+                "test_stats_logged_eventlet")
+
         # ensure that each task submission triggers stats printing
         self.flags(thread_pool_statistic_period=0)
         # make the tasks sequential to help simulating queued task
@@ -1687,6 +1698,12 @@ def reset():
 
     @mock.patch('oslo_service.backend.init_backend')
     def test_eventlet_selected(self, init_backend):
+        env = os.environ.get('OS_NOVA_DISABLE_EVENTLET_PATCHING', '').lower()
+        if env in ('1', 'true', 'yes'):
+            self.skipTest(
+                "In native threading mode this is covered by "
+                "test_threading_selected*")
+
         monkey_patch.patch()
 
         init_backend.assert_called_once_with(oslo_backend.BackendType.EVENTLET)

threading_unit_test_excludes.txt

@@ -16,11 +16,3 @@ nova.tests.unit.api.openstack.compute.test_services.ServicesTestV275.test_servic
 # not from nova.compute.api.HostAPI._service_get_all_cells but from the db api
 # _instance_get_by_uuid
 nova.tests.unit.conductor.test_conductor.ConductorTaskRPCAPITestCase.test_evacuate_old_rpc_without_target_state
-
-
-# This test has an eventlet and a threading version we
-# should either combine them and make the dynamic or
-# have the two variant executed conditionally
-nova.tests.unit.test_rpc.TestRPC.test_get_server
-nova.tests.unit.test_utils.ExecutorStatsTestCase.test_stats_logged_eventlet
-nova.tests.unit.test_utils.OsloServiceBackendSelectionTestCase.test_eventlet_selected