Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Unified Diff: tests/subprocess2_test.py

Issue 8688011: Move auto_stub.py from commit-queue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing_support/trial_dir.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/subprocess2_test.py
diff --git a/tests/subprocess2_test.py b/tests/subprocess2_test.py
index edb60323ddea499e31d8feab704c901e9d439514..e0cfd04a23b7a280b2321cc23a782c2e2ec43ac3 100755
--- a/tests/subprocess2_test.py
+++ b/tests/subprocess2_test.py
@@ -21,6 +21,8 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import subprocess2
+from testing_support import auto_stub
+
# Method could be a function
# pylint: disable=R0201
@@ -42,29 +44,10 @@ def convert_win(string):
return string
-class DefaultsTest(unittest.TestCase):
- # Can be mocked in a test.
- TO_SAVE = {
- subprocess2: [
- 'Popen', 'communicate', 'call', 'check_call', 'capture', 'check_output'],
- subprocess2.subprocess.Popen: ['__init__', 'communicate'],
- }
-
- def setUp(self):
- self.saved = {}
- for module, names in self.TO_SAVE.iteritems():
- self.saved[module] = dict(
- (name, getattr(module, name)) for name in names)
- # TODO(maruel): Do a reopen() on sys.__stdout__ and sys.__stderr__ so they
- # can be trapped in the child process for better coverage.
-
- def tearDown(self):
- for module, saved in self.saved.iteritems():
- for name, value in saved.iteritems():
- setattr(module, name, value)
-
- @staticmethod
- def _fake_communicate():
+class DefaultsTest(auto_stub.TestCase):
+ # TODO(maruel): Do a reopen() on sys.__stdout__ and sys.__stderr__ so they
+ # can be trapped in the child process for better coverage.
+ def _fake_communicate(self):
"""Mocks subprocess2.communicate()."""
results = {}
def fake_communicate(args, **kwargs):
@@ -72,11 +55,10 @@ class DefaultsTest(unittest.TestCase):
results.update(kwargs)
results['args'] = args
return ('stdout', 'stderr'), 0
- subprocess2.communicate = fake_communicate
+ self.mock(subprocess2, 'communicate', fake_communicate)
return results
- @staticmethod
- def _fake_Popen():
+ def _fake_Popen(self):
"""Mocks the whole subprocess2.Popen class."""
results = {}
class fake_Popen(object):
@@ -88,11 +70,10 @@ class DefaultsTest(unittest.TestCase):
@staticmethod
def communicate():
return None, None
- subprocess2.Popen = fake_Popen
+ self.mock(subprocess2, 'Popen', fake_Popen)
return results
- @staticmethod
- def _fake_subprocess_Popen():
+ def _fake_subprocess_Popen(self):
"""Mocks the base class subprocess.Popen only."""
results = {}
def __init__(self, args, **kwargs):
@@ -101,8 +82,8 @@ class DefaultsTest(unittest.TestCase):
results['args'] = args
def communicate():
return None, None
- subprocess2.subprocess.Popen.__init__ = __init__
- subprocess2.subprocess.Popen.communicate = communicate
+ self.mock(subprocess2.subprocess.Popen, '__init__', __init__)
+ self.mock(subprocess2.subprocess.Popen, 'communicate', communicate)
return results
def test_check_call_defaults(self):
« no previous file with comments | « testing_support/trial_dir.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698