diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Tools/Scripts/webkitpy/tool/steps/update_unittest.py | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Tools/Scripts/webkitpy/tool/steps/update_unittest.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/tool/steps/update_unittest.py | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/Tools/Scripts/webkitpy/tool/steps/update_unittest.py b/Tools/Scripts/webkitpy/tool/steps/update_unittest.py index c1a934db5..49d6b4098 100644 --- a/Tools/Scripts/webkitpy/tool/steps/update_unittest.py +++ b/Tools/Scripts/webkitpy/tool/steps/update_unittest.py @@ -26,9 +26,9 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import unittest +import unittest2 as unittest -from webkitpy.common.config.ports import ChromiumPort, ChromiumAndroidPort, ChromiumXVFBPort +from webkitpy.common.config.ports import MacPort, MacWK2Port from webkitpy.tool.mocktool import MockOptions, MockTool from webkitpy.tool.steps.update import Update @@ -41,14 +41,11 @@ class UpdateTest(unittest.TestCase): step = Update(tool, options) self.assertEqual(["mock-update-webkit"], step._update_command()) - tool._deprecated_port = ChromiumPort() - self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update"], step._update_command()) + tool._deprecated_port = MacPort() + self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command()) - tool._deprecated_port = ChromiumXVFBPort() - self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update"], step._update_command()) - - tool._deprecated_port = ChromiumAndroidPort() - self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--force-update", "--chromium-android"], step._update_command()) + tool._deprecated_port = MacWK2Port() + self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command()) def test_update_command_interactive(self): tool = MockTool() @@ -56,11 +53,8 @@ class UpdateTest(unittest.TestCase): step = Update(tool, options) self.assertEqual(["mock-update-webkit"], step._update_command()) - tool._deprecated_port = ChromiumPort() - self.assertEqual(["Tools/Scripts/update-webkit", "--chromium"], step._update_command()) - - tool._deprecated_port = ChromiumXVFBPort() - self.assertEqual(["Tools/Scripts/update-webkit", "--chromium"], step._update_command()) + tool._deprecated_port = MacPort() + self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command()) - tool._deprecated_port = ChromiumAndroidPort() - self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--chromium-android"], step._update_command()) + tool._deprecated_port = MacWK2Port() + self.assertEqual(["Tools/Scripts/update-webkit"], step._update_command()) |