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

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/port/browser_test.py

Issue 569913002: fix virtual_test_suites() for browser_test ports (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rework implementation of test_virtual_test_suites(), browser_test_unittest Created 6 years, 3 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (C) 2014 Google Inc. All rights reserved. 1 # Copyright (C) 2014 Google Inc. All rights reserved.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following disclaimer 10 # copyright notice, this list of conditions and the following disclaimer
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 def driver_name(self): 64 def driver_name(self):
65 return 'browser_tests' 65 return 'browser_tests'
66 66
67 def default_timeout_ms(self): 67 def default_timeout_ms(self):
68 timeout_ms = 10 * 1000 68 timeout_ms = 10 * 1000
69 if self.get_option('configuration') == 'Debug': # pylint: disable=E1101 69 if self.get_option('configuration') == 'Debug': # pylint: disable=E1101
70 # Debug is usually 2x-3x slower than Release. 70 # Debug is usually 2x-3x slower than Release.
71 return 3 * timeout_ms 71 return 3 * timeout_ms
72 return timeout_ms 72 return timeout_ms
73 73
74 def virtual_test_suites(self):
75 return []
76
74 77
75 class BrowserTestLinuxPort(BrowserTestPortOverrides, linux.LinuxPort): 78 class BrowserTestLinuxPort(BrowserTestPortOverrides, linux.LinuxPort):
76 pass 79 pass
77 80
78 81
79 class BrowserTestMacPort(BrowserTestPortOverrides, mac.MacPort): 82 class BrowserTestMacPort(BrowserTestPortOverrides, mac.MacPort):
80 def _path_to_driver(self, configuration=None): 83 def _path_to_driver(self, configuration=None):
81 return self._build_path_with_configuration(configuration, self.driver_na me()) 84 return self._build_path_with_configuration(configuration, self.driver_na me())
82 85
83 def default_timeout_ms(self): 86 def default_timeout_ms(self):
84 timeout_ms = 20 * 1000 87 timeout_ms = 20 * 1000
85 if self.get_option('configuration') == 'Debug': # pylint: disable=E1101 88 if self.get_option('configuration') == 'Debug': # pylint: disable=E1101
86 # Debug is usually 2x-3x slower than Release. 89 # Debug is usually 2x-3x slower than Release.
87 return 3 * timeout_ms 90 return 3 * timeout_ms
88 return timeout_ms 91 return timeout_ms
89 92
90 93
91 class BrowserTestWinPort(BrowserTestPortOverrides, win.WinPort): 94 class BrowserTestWinPort(BrowserTestPortOverrides, win.WinPort):
92 def default_timeout_ms(self): 95 def default_timeout_ms(self):
93 timeout_ms = 20 * 1000 96 timeout_ms = 20 * 1000
94 if self.get_option('configuration') == 'Debug': # pylint: disable=E1101 97 if self.get_option('configuration') == 'Debug': # pylint: disable=E1101
95 # Debug is usually 2x-3x slower than Release. 98 # Debug is usually 2x-3x slower than Release.
96 return 3 * timeout_ms 99 return 3 * timeout_ms
97 return timeout_ms 100 return timeout_ms
OLDNEW
« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698