openstack/swift
Code Issues Proposed changes

Merge "Stop reloading swift.common.utils in test_daemon"

Browse Source
This commit is contained in:
Jenkins 2017-09-27 03:54:30 +00:00 committed by Gerrit Code Review
commit ff23dcdf3a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/unit/common/test_daemon.py
View File

@ -15,7 +15,6 @@
import os import os
from six import StringIO from six import StringIO
from six.moves import reload_module
import time import time
import unittest import unittest
from getpass import getuser from getpass import getuser
@ -102,13 +101,14 @@ class TestWorkerDaemon(unittest.TestCase):
class TestRunDaemon(unittest.TestCase): class TestRunDaemon(unittest.TestCase):
def setUp(self): def setUp(self):
utils.HASH_PATH_SUFFIX = 'endcap' for patcher in [
utils.HASH_PATH_PREFIX = 'startcap' mock.patch.object(utils, 'HASH_PATH_PREFIX', 'startcap'),
utils.drop_privileges = lambda *args: None mock.patch.object(utils, 'HASH_PATH_SUFFIX', 'endcap'),
utils.capture_stdio = lambda *args: None mock.patch.object(utils, 'drop_privileges', lambda *args: None),
mock.patch.object(utils, 'capture_stdio', lambda *args: None),
def tearDown(self): ]:
reload_module(utils) patcher.start()
self.addCleanup(patcher.stop)
def test_run(self): def test_run(self):
d = MyDaemon({}) d = MyDaemon({})