diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
tree | 73dc228333948738bbe02976cacca8cd382bc978 /Tools/Scripts/webkitpy/tool/steps/update_unittest.py | |
parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Tools/Scripts/webkitpy/tool/steps/update_unittest.py')
-rw-r--r-- | Tools/Scripts/webkitpy/tool/steps/update_unittest.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Tools/Scripts/webkitpy/tool/steps/update_unittest.py b/Tools/Scripts/webkitpy/tool/steps/update_unittest.py index 19ef949da..c1a934db5 100644 --- a/Tools/Scripts/webkitpy/tool/steps/update_unittest.py +++ b/Tools/Scripts/webkitpy/tool/steps/update_unittest.py @@ -28,7 +28,7 @@ import unittest -from webkitpy.common.config.ports import ChromiumPort, ChromiumXVFBPort +from webkitpy.common.config.ports import ChromiumPort, ChromiumAndroidPort, ChromiumXVFBPort from webkitpy.tool.mocktool import MockOptions, MockTool from webkitpy.tool.steps.update import Update @@ -47,6 +47,9 @@ class UpdateTest(unittest.TestCase): 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()) + def test_update_command_interactive(self): tool = MockTool() options = MockOptions(non_interactive=False) @@ -58,3 +61,6 @@ class UpdateTest(unittest.TestCase): tool._deprecated_port = ChromiumXVFBPort() self.assertEqual(["Tools/Scripts/update-webkit", "--chromium"], step._update_command()) + + tool._deprecated_port = ChromiumAndroidPort() + self.assertEqual(["Tools/Scripts/update-webkit", "--chromium", "--chromium-android"], step._update_command()) |