Changeset 179788 in webkit

Timestamp:

Feb 7, 2015 4:44:06 PM (9 years ago)

Author:

ddkilzer@apple.com

Message:

[iOS] Make Simulator class testable
<​http://webkit.org/b/141358>

Rubber-stamped by Darin Adler.

• Scripts/webkitpy/common/system/platforminfo.py:

(PlatformInfo.xcode_simctl_list): Move xcrun simctl list
command to here from Simulator.refresh() in xcode/simulator.py
so that the output of the command can be mocked.

• Scripts/webkitpy/common/system/platforminfo_mock.py:

(MockPlatformInfo.init): Set self.expected_xcode_simctl_list
to None.
(MockPlatformInfo.xcode_simctl_list): Add method that returns
self.expected_xcode_simctl_list expectation.

• Scripts/webkitpy/xcode/simulator.py: Add missing copyright

and license header.
(Simulator.init): Add optional 'host' parameter to make it
possible to pass in a mock object for testing. Set self._host
to 'host' parameter or create Host() object.
(Simulator.refresh): Call new PlatformInfo.xcode_simctl_list()
method.

• Scripts/webkitpy/xcode/simulator_unittest.py: Add unit test

for current code.
(SimulatorTest):
(SimulatorTest.setUp):
(SimulatorTest._set_expected_xcrun_simctl_list):
(SimulatorTest.test_simulator_device_types):
(test_invalid_device_types_header):
(test_invalid_runtimes_header):
(test_invalid_devices_header):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/platforminfo.py (modified) (1 diff)
• Scripts/webkitpy/common/system/platforminfo_mock.py (modified) (2 diffs)
• Scripts/webkitpy/xcode/simulator.py (modified) (4 diffs)
• Scripts/webkitpy/xcode/simulator_unittest.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-02-07  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Make Simulator class testable
+        <http://webkit.org/b/141358>
+
+        Rubber-stamped by Darin Adler.
+
+        * Scripts/webkitpy/common/system/platforminfo.py:
+        (PlatformInfo.xcode_simctl_list): Move `xcrun simctl list`
+        command to here from Simulator.refresh() in xcode/simulator.py
+        so that the output of the command can be mocked.
+
+        * Scripts/webkitpy/common/system/platforminfo_mock.py:
+        (MockPlatformInfo.__init__): Set self.expected_xcode_simctl_list
+        to None.
+        (MockPlatformInfo.xcode_simctl_list): Add method that returns
+        self.expected_xcode_simctl_list expectation.
+
+        * Scripts/webkitpy/xcode/simulator.py: Add missing copyright
+        and license header.
+        (Simulator.__init__): Add optional 'host' parameter to make it
+        possible to pass in a mock object for testing.  Set self._host
+        to 'host' parameter or create Host() object.
+        (Simulator.refresh): Call new PlatformInfo.xcode_simctl_list()
+        method.
+
+        * Scripts/webkitpy/xcode/simulator_unittest.py: Add unit test
+        for current code.
+        (SimulatorTest):
+        (SimulatorTest.setUp):
+        (SimulatorTest._set_expected_xcrun_simctl_list):
+        (SimulatorTest.test_simulator_device_types):
+        (test_invalid_device_types_header):
+        (test_invalid_runtimes_header):
+        (test_invalid_devices_header):
+
 2015-02-07  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py

@@ -126 +126 @@
         return ''
 
+    def xcode_simctl_list(self):
+        if not self.is_mac():
+            return ()
+        output = self._executive.run_command(['xcrun', 'simctl', 'list'], return_stderr=False)
+        return (line for line in output.splitlines())
+
     def _determine_os_name(self, sys_platform):
         if sys_platform == 'darwin':

trunk/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py

@@ -32 +32 @@
         self.os_name = os_name
         self.os_version = os_version
+        self.expected_xcode_simctl_list = None
 
     def is_mac(self):
@@ -59 +60 @@
     def xcode_sdk_version(self, sdk_name):
         return '8.1'
+
+    def xcode_simctl_list(self):
+        return self.expected_xcode_simctl_list

trunk/Tools/Scripts/webkitpy/xcode/simulator.py

@@ +1 @@
+# Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (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 itertools
 import logging
@@ -6 +28 @@
 import subprocess
 import time
+
+from webkitpy.common.host import Host
 
 _log = logging.getLogger(__name__)
@@ -217 +241 @@
         '\s*(?P<name>[^(]+ )\((?P<udid>[^)]+)\) \((?P<state>[^)]+)\)( \((?P<availability>[^)]+)\))?')
 
-    def __init__(self):
+    def __init__(self, host=None):
+        self._host = host or Host()
         self.runtimes = []
         self.device_types = []
@@ -252 +277 @@
         Refresh runtime and device type information from ``simctl list``.
         """
-        command = ['xcrun', 'simctl', 'list']
-        simctl_p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = simctl_p.communicate()
-        if simctl_p.returncode != 0:
-            raise RuntimeError(
-                '{command} failed:\n{stdout}\n{stderr}'.format(command=' '.join(command), stdout=stdout, stderr=stderr))
-
-        lines = (line for line in stdout.splitlines())
+        lines = self._host.platform.xcode_simctl_list()
         device_types_header = next(lines)
         if device_types_header != '== Device Types ==':