Title: [179716] trunk/Tools
Revision
179716
Author
[email protected]
Date
2015-02-05 15:15:30 -0800 (Thu, 05 Feb 2015)

Log Message

[iOS] webkitpy.xcode.simulator.Runtime.from_identifier() returns wrong result for non-existent runtime
https://bugs.webkit.org/show_bug.cgi?id=141306

Reviewed by Alexey Proskuryakov.

The function webkitpy.xcode.simulator.Runtime.from_identifier always returns a Runtime object
corresponding to the last-most runtime parsed from the output of `simctl list` for any non-
existent runtime.

* Scripts/webkitpy/xcode/simulator.py:
(Runtime.from_identifier):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (179715 => 179716)


--- trunk/Tools/ChangeLog	2015-02-05 23:01:36 UTC (rev 179715)
+++ trunk/Tools/ChangeLog	2015-02-05 23:15:30 UTC (rev 179716)
@@ -1,5 +1,19 @@
 2015-02-05  Daniel Bates  <[email protected]>
 
+        [iOS] webkitpy.xcode.simulator.Runtime.from_identifier() returns wrong result for non-existent runtime
+        https://bugs.webkit.org/show_bug.cgi?id=141306
+
+        Reviewed by Alexey Proskuryakov.
+
+        The function webkitpy.xcode.simulator.Runtime.from_identifier always returns a Runtime object
+        corresponding to the last-most runtime parsed from the output of `simctl list` for any non-
+        existent runtime.
+
+        * Scripts/webkitpy/xcode/simulator.py:
+        (Runtime.from_identifier):
+
+2015-02-05  Daniel Bates  <[email protected]>
+
         LayoutTestRelay does not install DumpRenderTree.app/WebKitTestRunnerApp.app
         https://bugs.webkit.org/show_bug.cgi?id=139746
         <rdar://problem/19283658>

Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (179715 => 179716)


--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py	2015-02-05 23:01:36 UTC (rev 179715)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py	2015-02-05 23:15:30 UTC (rev 179716)
@@ -110,13 +110,10 @@
         :returns: A `Runtime` object with the specified identifier or throws a TypeError if it doesn't exist.
         :rtype: Runtime
         """
-        runtime = None
         for runtime in Simulator().runtimes:
             if runtime.identifier == identifier:
-                break
-        if runtime is None:
-            raise TypeError('A runtime with identifier "{identifier}" does not exist.'.format(identifier=identifier))
-        return runtime
+                return runtime
+        raise TypeError('A runtime with identifier "{identifier}" does not exist.'.format(identifier=identifier))
 
     def __eq__(self, other):
         return (self.version == other.version) and (self.identifier == other.identifier) and (self.is_internal_runtime == other.is_internal_runtime)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to