| Index: tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py
|
| diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py
|
| index 7192c13761e6f206032ef4b9a7fcb579b01ad2f5..e33976de7507c6e536e412e7d0adcb6670145430 100644
|
| --- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py
|
| +++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py
|
| @@ -5,6 +5,7 @@ import unittest
|
|
|
| from telemetry.core import browser_options
|
| from telemetry.core.backends.chrome import desktop_browser_finder
|
| +from telemetry.unittest import DisabledTestOnCrOS
|
| from telemetry.unittest import system_stub
|
|
|
| # This file verifies the logic for finding a browser instance on all platforms
|
| @@ -42,18 +43,21 @@ class FindSystemTest(FindTestBase):
|
| super(FindSystemTest, self).setUp()
|
| self._stubs.sys.platform = 'win32'
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindProgramFiles(self):
|
| self._files.append(
|
| 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe')
|
| self._stubs.os.program_files = 'C:\\Program Files'
|
| self.assertTrue('system' in self.DoFindAllTypes())
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindProgramFilesX86(self):
|
| self._files.append(
|
| 'C:\\Program Files(x86)\\Google\\Chrome\\Application\\chrome.exe')
|
| self._stubs.os.program_files_x86 = 'C:\\Program Files(x86)'
|
| self.assertTrue('system' in self.DoFindAllTypes())
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindLocalAppData(self):
|
| self._files.append(
|
| 'C:\\Local App Data\\Google\\Chrome\\Application\\chrome.exe')
|
| @@ -65,14 +69,17 @@ class FindLocalBuildsTest(FindTestBase):
|
| super(FindLocalBuildsTest, self).setUp()
|
| self._stubs.sys.platform = 'win32'
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindBuild(self):
|
| self._files.append('..\\..\\..\\build\\Release\\chrome.exe')
|
| self.assertTrue('release' in self.DoFindAllTypes())
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindOut(self):
|
| self._files.append('..\\..\\..\\out\\Release\\chrome.exe')
|
| self.assertTrue('release' in self.DoFindAllTypes())
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindXcodebuild(self):
|
| self._files.append('..\\..\\..\\xcodebuild\\Release\\chrome.exe')
|
| self.assertTrue('release' in self.DoFindAllTypes())
|
| @@ -94,6 +101,7 @@ class OSXFindTest(FindTestBase):
|
| self._files.append(
|
| '../../../out/Debug/Content Shell.app/Contents/MacOS/Content Shell')
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindAll(self):
|
| types = self.DoFindAllTypes()
|
| self.assertEquals(
|
| @@ -122,6 +130,7 @@ class LinuxFindTest(FindTestBase):
|
| raise OSError('Not found')
|
| self._stubs.subprocess.call = call_hook
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindAllWithExact(self):
|
| types = self.DoFindAllTypes()
|
| self.assertEquals(
|
| @@ -129,10 +138,12 @@ class LinuxFindTest(FindTestBase):
|
| set(['debug', 'release',
|
| 'content-shell-debug', 'content-shell-release']))
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindWithProvidedExecutable(self):
|
| self._finder_options.browser_executable = '/foo/chrome'
|
| self.assertTrue('exact' in self.DoFindAllTypes())
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindUsingDefaults(self):
|
| self.has_google_chrome_on_path = True
|
| self.assertTrue('release' in self.DoFindAllTypes())
|
| @@ -146,6 +157,7 @@ class LinuxFindTest(FindTestBase):
|
| self.assertEquals(['content-shell-debug', 'content-shell-release'],
|
| self.DoFindAllTypes())
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindUsingRelease(self):
|
| self.assertTrue('release' in self.DoFindAllTypes())
|
|
|
| @@ -166,6 +178,7 @@ class WinFindTest(FindTestBase):
|
| self._files.append(self._stubs.os.local_app_data + '\\' +
|
| 'Google\\Chrome SxS\\Application\\chrome.exe')
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindAllGivenDefaults(self):
|
| types = self.DoFindAllTypes()
|
| self.assertEquals(set(types),
|
| @@ -173,6 +186,7 @@ class WinFindTest(FindTestBase):
|
| 'content-shell-debug', 'content-shell-release',
|
| 'system', 'canary']))
|
|
|
| + @DisabledTestOnCrOS
|
| def testFindAllWithExact(self):
|
| self._finder_options.browser_executable = 'c:\\tmp\\chrome.exe'
|
| types = self.DoFindAllTypes()
|
|
|