Chromium Code Reviews| Index: tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder_unittest.py |
| diff --git a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder_unittest.py b/tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder_unittest.py |
| index c122ccb3f694400316cfacfcf00c9ca8a3c00054..b630b26240d96349b8d4512c12d6c440957a9ed0 100644 |
| --- a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder_unittest.py |
| +++ b/tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder_unittest.py |
| @@ -1,7 +1,6 @@ |
| # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| -import os as real_os |
| import unittest |
| from chrome_remote_control import browser_options |
| @@ -14,29 +13,24 @@ from chrome_remote_control.system_stub import * |
| # We prefer this approach to having to run the same test on every platform on |
| # which we want this code to work. |
| -class StubSubprocess(object): |
| - def __init__(self): |
| - self.call_hook = None |
| - |
| - def call(self, *args, **kwargs): |
| - assert self.call_hook |
| - return self.call_hook(*args, **kwargs) |
| - |
| class FindTestBase(unittest.TestCase): |
| def setUp(self): |
| self._options = browser_options.BrowserOptions() |
| self._options.chrome_root = '../../../' |
| self._sys_stub = SysModuleStub() |
| self._os_stub = OSModuleStub(self._sys_stub) |
| - self._subprocess_stub = StubSubprocess() |
| + self._subprocess_stub = SubprocessModuleStub() |
|
nduca
2012/09/20 04:18:30
Where do you tear down?
dtu
2012/09/25 02:01:50
Done.
|
| @property |
| def _files(self): |
| return self._os_stub.files |
| def DoFindAll(self): |
| - return desktop_browser_finder.FindAllAvailableBrowsers(self._options, |
| - self._os_stub, self._sys_stub, self._subprocess_stub) |
| + with Override(desktop_browser_finder, |
| + os=self._os_stub, |
|
nduca
2012/09/20 04:18:30
how about making override just create all the righ
dtu
2012/09/25 02:01:50
Done. Override is from system_stub.
|
| + subprocess=self._subprocess_stub, |
| + sys=self._sys_stub): |
| + return desktop_browser_finder.FindAllAvailableBrowsers(self._options) |
| def DoFindAllTypes(self): |
| browsers = self.DoFindAll() |