| Index: tests/scm_unittest.py
|
| diff --git a/tests/scm_unittest.py b/tests/scm_unittest.py
|
| index 21150f3ff8e7053bfa7ca6b78fb622a75fe08c27..6b4faf3587b13ca1fb6038a76210d33367ba1821 100755
|
| --- a/tests/scm_unittest.py
|
| +++ b/tests/scm_unittest.py
|
| @@ -16,6 +16,7 @@ from super_mox import SuperMoxTestBase
|
|
|
| import fake_repos
|
| import scm
|
| +import subprocess2
|
|
|
|
|
| class BaseTestCase(SuperMoxTestBase):
|
| @@ -32,10 +33,10 @@ class BaseTestCase(SuperMoxTestBase):
|
| class BaseSCMTestCase(BaseTestCase):
|
| def setUp(self):
|
| BaseTestCase.setUp(self)
|
| - self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCall')
|
| self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCallAndFilter')
|
| self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCallAndFilterAndHeader')
|
| - self.mox.StubOutWithMock(scm.gclient_utils, 'Popen')
|
| + self.mox.StubOutWithMock(subprocess2, 'Popen')
|
| + self.mox.StubOutWithMock(subprocess2, 'communicate')
|
|
|
|
|
| class RootTestCase(BaseSCMTestCase):
|
| @@ -45,7 +46,7 @@ class RootTestCase(BaseSCMTestCase):
|
| 'ElementTree', 'GetCasedPath', 'GenFakeDiff', 'GIT', 'SVN',
|
| 'ValidateEmail',
|
| 'cStringIO', 'determine_scm', 'gclient_utils', 'glob', 'logging', 'os',
|
| - 're', 'shutil', 'subprocess', 'subprocess2', 'sys', 'tempfile', 'time',
|
| + 're', 'subprocess2', 'sys', 'tempfile', 'time',
|
| ]
|
| # If this test fails, you should add the relevant test.
|
| self.compareMembers(scm, members)
|
|
|