Merge "Set lock_path in tests"
This commit is contained in:
@@ -30,6 +30,7 @@ import copy
|
|||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import sys
|
import sys
|
||||||
|
import tempfile
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
@@ -252,6 +253,8 @@ class TestCase(testtools.TestCase):
|
|||||||
CONF.set_override('fatal_exception_format_errors', True)
|
CONF.set_override('fatal_exception_format_errors', True)
|
||||||
CONF.set_override('enabled', True, 'osapi_v3')
|
CONF.set_override('enabled', True, 'osapi_v3')
|
||||||
CONF.set_override('force_dhcp_release', False)
|
CONF.set_override('force_dhcp_release', False)
|
||||||
|
# This will be cleaned up by the NestedTempfile fixture
|
||||||
|
CONF.set_override('lock_path', tempfile.mkdtemp())
|
||||||
|
|
||||||
def _restore_obj_registry(self):
|
def _restore_obj_registry(self):
|
||||||
objects_base.NovaObject._obj_classes = self._base_test_obj_backup
|
objects_base.NovaObject._obj_classes = self._base_test_obj_backup
|
||||||
|
Reference in New Issue
Block a user