Merge "Replace fake_utils by using Fixture"

nova/tests/functional/api_sample_tests/api_sample_base.py

@@ -18,10 +18,10 @@ import testscenarios
 
 import nova.conf
 from nova import test
+from nova.tests import fixtures
 from nova.tests.functional import api_paste_fixture
 from nova.tests.functional import api_samples_test_base
 from nova.tests.unit import fake_network
-from nova.tests.unit import fake_utils
 
 CONF = nova.conf.CONF
 
@@ -93,7 +93,6 @@ class ApiSampleTestBaseV21(testscenarios.WithScenarios,
 
         self.useFixture(test.SampleNetworks(host=self.network.host))
         fake_network.stub_compute_with_ips(self.stubs)
-        fake_utils.stub_out_utils_spawn_n(self.stubs)
-
+        self.useFixture(fixtures.SpawnIsSynchronousFixture())
         # this is used to generate sample docs
         self.generate_samples = os.getenv('GENERATE_SAMPLES') is not None

nova/tests/unit/conductor/test_conductor.py

@@ -54,7 +54,6 @@ from nova.tests.unit import fake_instance
 from nova.tests.unit import fake_notifier
 from nova.tests.unit import fake_request_spec
 from nova.tests.unit import fake_server_actions
-from nova.tests.unit import fake_utils
 from nova.tests import uuidsentinel as uuids
 from nova import utils
 
@@ -85,7 +84,7 @@ class _BaseTestCase(object):
         self.stubs.Set(rpc.RequestContextSerializer, 'deserialize_context',
                        fake_deserialize_context)
 
-        fake_utils.stub_out_utils_spawn_n(self.stubs)
+        self.useFixture(fixtures.SpawnIsSynchronousFixture())
 
 
 class ConductorTestCase(_BaseTestCase, test.TestCase):

nova/tests/unit/fake_utils.py

@@ -1,36 +0,0 @@
-# Copyright (c) 2013 Rackspace Hosting
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""This modules stubs out functions in nova.utils."""
-
-from nova import utils
-
-
-def stub_out_utils_spawn_n(stubs):
-    """Stubs out spawn_n with a blocking version.
-
-    This aids testing async processes by blocking until they're done.
-    """
-    def no_spawn(func, *args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except Exception:
-            # NOTE(danms): This is supposed to simulate spawning
-            # of a thread, which would run separate from the parent,
-            # and die silently on error. If we don't catch and discard
-            # any exceptions here, we're not honoring the usual
-            # behavior.
-            pass
-
-    stubs.Set(utils, 'spawn_n', no_spawn)