openstack/oslo.concurrency
Code Issues Proposed changes

Using fixtures.MockPatch instead of mockpatch.Patch

Browse Source 
This module has been deprecated in favor of fixtures.MockPatch.

Change-Id: Iee59fa82e727e0575e8b6b6afe042231aa8fa5b8
This commit is contained in:
gecong1973 2017-03-09 14:45:42 +08:00
parent 998c12a34a
commit dd2ef6f565
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oslo_concurrency/tests/unit/test_processutils.py
View File

@ -33,7 +33,6 @@ from oslotest import base as test_base
import six import six
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslotest import mockpatch
PROCESS_EXECUTION_ERROR_LOGGING_TEST = """#!/bin/bash PROCESS_EXECUTION_ERROR_LOGGING_TEST = """#!/bin/bash
@ -284,7 +283,7 @@ grep foo
# This test and the one below ensures that when communicate raises # This test and the one below ensures that when communicate raises
# an OSError, we do the right thing(s) # an OSError, we do the right thing(s)
def test_exception_on_communicate_error(self): def test_exception_on_communicate_error(self):
mock = self.useFixture(mockpatch.Patch( mock = self.useFixture(fixtures.MockPatch(
'subprocess.Popen.communicate', 'subprocess.Popen.communicate',
side_effect=OSError(errno.EAGAIN, 'fake-test'))) side_effect=OSError(errno.EAGAIN, 'fake-test')))
@ -297,7 +296,7 @@ grep foo
self.assertEqual(1, mock.mock.call_count) self.assertEqual(1, mock.mock.call_count)
def test_retry_on_communicate_error(self): def test_retry_on_communicate_error(self):
mock = self.useFixture(mockpatch.Patch( mock = self.useFixture(fixtures.MockPatch(
'subprocess.Popen.communicate', 'subprocess.Popen.communicate',
side_effect=OSError(errno.EAGAIN, 'fake-test'))) side_effect=OSError(errno.EAGAIN, 'fake-test')))
@ -312,7 +311,7 @@ grep foo
def _test_and_check_logging_communicate_errors(self, log_errors=None, def _test_and_check_logging_communicate_errors(self, log_errors=None,
attempts=None): attempts=None):
mock = self.useFixture(mockpatch.Patch( mock = self.useFixture(fixtures.MockPatch(
'subprocess.Popen.communicate', 'subprocess.Popen.communicate',
side_effect=OSError(errno.EAGAIN, 'fake-test'))) side_effect=OSError(errno.EAGAIN, 'fake-test')))