OLD | NEW |
---|---|
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 |
11 # in the documentation and/or other materials provided with the | 11 # in the documentation and/or other materials provided with the |
12 # distribution. | 12 # distribution. |
13 # * Neither the name of Google Inc. nor the names of its | 13 # * Neither the Google name nor the names of its |
Dirk Pranke
2014/07/17 00:31:15
this is an odd diff ...
ivandavid
2014/07/17 03:04:47
O_o ... I don't know how that happened.
ivandavid
2014/07/17 03:04:47
Done.
| |
14 # contributors may be used to endorse or promote products derived from | 14 # contributors may be used to endorse or promote products derived from |
15 # this software without specific prior written permission. | 15 # this software without specific prior written permission. |
16 # | 16 # |
17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
28 | 28 |
29 | 29 from webkitpy.layout_tests.port import base |
Dirk Pranke
2014/07/17 00:31:15
you don't need to import base (see below)
ivandavid
2014/07/17 03:04:48
Done.
| |
30 def _CheckCodeMirrorChanges(input_api, output_api): | 30 from webkitpy.layout_tests.port import linux |
31 errorText = ("ERROR: Attempt to modify CodeMirror. The only allowed changes are " | 31 from webkitpy.layout_tests.port import mac |
32 "rolls from the upstream (http://codemirror.net). If this is a roll, " | 32 from webkitpy.layout_tests.port import win |
33 "make sure you mention 'roll CodeMirror' (no quotes) in the cha nge description.\n" | 33 from webkitpy.layout_tests.port import browser_test_driver |
34 "CodeMirror rolling instructions:\n" | |
35 " https://sites.google.com/a/chromium.org/devtools-codemirro r-rolling") | |
36 changeDescription = input_api.change.DescriptionText() | |
37 errors = [] | |
38 if not "roll codemirror" in changeDescription.lower(): | |
39 errors.append(output_api.PresubmitError(errorText)) | |
40 return errors | |
41 | 34 |
42 | 35 |
43 def CheckChangeOnUpload(input_api, output_api): | 36 def get_port_class_name(port_name): |
44 results = [] | 37 if 'linux' in port_name: |
45 results.extend(_CheckCodeMirrorChanges(input_api, output_api)) | 38 return 'BrowserTestLinuxPort' |
46 return results | 39 elif 'mac' in port_name: |
40 return 'BrowserTestMacPort' | |
41 elif 'win' in port_name: | |
42 return 'BrowserTestWinPort' | |
43 return None | |
44 | |
45 | |
46 class BrowserTestPortOverrides(base.Port): | |
Dirk Pranke
2014/07/17 00:31:15
this should just be object, not base.Port, since i
ivandavid
2014/07/17 03:04:48
Done.
ivandavid
2014/07/17 03:04:48
I had to swap the order of inheritance, ie.
linux
Dirk Pranke
2014/07/17 21:20:12
Correct, the overriding class (the mixin) needs to
| |
47 """Set of overrides that every browser test platform port should have.""" | |
48 | |
49 def _driver_class(self): | |
50 return browser_test_driver.BrowserTestDriver | |
51 | |
52 def layout_tests_dir(self): | |
53 """Overriden function from the base port class. Redirects everything | |
54 to src/chrome/test/data/printing/layout_tests. | |
55 """ | |
56 return self.path_from_chromium_base('chrome', 'test', 'data', 'printing' , 'layout_tests', 'tests') | |
57 | |
58 | |
59 class BrowserTestLinuxPort(linux.LinuxPort, BrowserTestPortOverrides): | |
60 pass | |
61 | |
62 | |
63 class BrowserTestMacPort(mac.MacPort, BrowserTestPortOverrides): | |
64 def _path_to_driver(self, configuration=None): | |
65 return self._build_path_with_configuration(configuration, self.driver_na me()) | |
66 | |
67 | |
68 class BrowserTestWinPort(win.WinPort, BrowserTestPortOverrides): | |
69 pass | |
OLD | NEW |