| OLD | NEW |
| 1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 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 10 matching lines...) Expand all Loading... |
| 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 import json | 29 import json |
| 30 import sys | 30 import sys |
| 31 import unittest2 as unittest | 31 from webkitpy.thirdparty import unittest2 as unittest |
| 32 | 32 |
| 33 from webkitpy.common.system.outputcapture import OutputCapture | 33 from webkitpy.common.system.outputcapture import OutputCapture |
| 34 from webkitpy.layout_tests.models.test_configuration import * | 34 from webkitpy.layout_tests.models.test_configuration import * |
| 35 from webkitpy.layout_tests.port import builders | 35 from webkitpy.layout_tests.port import builders |
| 36 from webkitpy.thirdparty.mock import Mock | 36 from webkitpy.thirdparty.mock import Mock |
| 37 from webkitpy.tool.mocktool import MockTool | 37 from webkitpy.tool.mocktool import MockTool |
| 38 from webkitpy.common.system.executive_mock import MockExecutive | 38 from webkitpy.common.system.executive_mock import MockExecutive |
| 39 from webkitpy.common.host_mock import MockHost | 39 from webkitpy.common.host_mock import MockHost |
| 40 from webkitpy.tool.servers.gardeningserver import * | 40 from webkitpy.tool.servers.gardeningserver import * |
| 41 | 41 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 self.output = ['{"add": [], "delete": []}', ''] | 127 self.output = ['{"add": [], "delete": []}', ''] |
| 128 | 128 |
| 129 def run_command(args, cwd=None, input=None, **kwargs): | 129 def run_command(args, cwd=None, input=None, **kwargs): |
| 130 print >> sys.stderr, "MOCK run_command: %s, cwd=%s, input=%s" % (arg
s, cwd, input) | 130 print >> sys.stderr, "MOCK run_command: %s, cwd=%s, input=%s" % (arg
s, cwd, input) |
| 131 return self.output.pop(0) | 131 return self.output.pop(0) |
| 132 | 132 |
| 133 server.tool.executive.run_command = run_command | 133 server.tool.executive.run_command = run_command |
| 134 self._post_to_path("/rebaselineall", body='{"user-scripts/another-test.h
tml":{"MOCK builder": ["txt","png"]}}', expected_stderr=expected_stderr % ('MOCK
builder', '"txt","png"'), expected_stdout=expected_stdout, server=server) | 134 self._post_to_path("/rebaselineall", body='{"user-scripts/another-test.h
tml":{"MOCK builder": ["txt","png"]}}', expected_stderr=expected_stderr % ('MOCK
builder', '"txt","png"'), expected_stdout=expected_stdout, server=server) |
| 135 | 135 |
| 136 self._post_to_path("/rebaselineall", body='{"user-scripts/another-test.h
tml":{"MOCK builder (Debug)": ["txt","png"]}}', expected_stderr=expected_stderr
% ('MOCK builder (Debug)', '"txt","png"'), expected_stdout=expected_stdout) | 136 self._post_to_path("/rebaselineall", body='{"user-scripts/another-test.h
tml":{"MOCK builder (Debug)": ["txt","png"]}}', expected_stderr=expected_stderr
% ('MOCK builder (Debug)', '"txt","png"'), expected_stdout=expected_stdout) |
| OLD | NEW |