Attachment 361195 Details for Bug 194133 – Patch

[patch] Patch

bug-194133-20190205091217.patch (text/plain), 3.41 KB, created by Jonathan Bedard on 2019-02-05 09:12:18 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-02-05 09:12:18 PST

Size: 3.41 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 240975)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2019-02-05  Jonathan Bedard  <jbedard@apple.com>
>+
>+        run-webkit-tests emits message "...running None" when running tests
>+        https://bugs.webkit.org/show_bug.cgi?id=194133
>+        <rdar://problem/47724738>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/xcode/device_type.py:
>+        (DeviceType.__str__): Use both version mapping tables and use just the variant
>+        name if no version name is available.
>+        * Scripts/webkitpy/xcode/device_type_unittest.py:
>+        (DeviceTypeTest):
>+        (DeviceTypeTest.test_unmapped_version): Test case where the version does not have
>+        an associated named.
>+
> 2019-02-04  Ms2ger  <Ms2ger@igalia.com>
> 
>         [GTK][WPE] Need a function to convert internal URI to display ("pretty") URI
>Index: Tools/Scripts/webkitpy/xcode/device_type.py
>===================================================================
>--- Tools/Scripts/webkitpy/xcode/device_type.py	(revision 240963)
>+++ Tools/Scripts/webkitpy/xcode/device_type.py	(working copy)
>@@ -20,7 +20,8 @@
> # 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.
> 
>-from webkitpy.common.version_name_map import VersionNameMap
>+from webkitpy.common.version_name_map import VersionNameMap, INTERNAL_TABLE
>+from webkitpy.port.config import apple_additions
> 
> 
> # This class is designed to match device types. Because it is used for matching, 'None' is treated as a wild-card.
>@@ -108,10 +109,16 @@ class DeviceType(object):
>         self.check_consistency()
> 
>     def __str__(self):
>+        version = None
>+        if self.software_version and apple_additions():
>+            version = VersionNameMap.map().to_name(self.software_version, platform=self.software_variant.lower(), table=INTERNAL_TABLE)
>+        elif self.software_version:
>+            version = VersionNameMap.map().to_name(self.software_version, platform=self.software_variant.lower())
>+
>         return '{hardware_family}{hardware_type} running {version}'.format(
>             hardware_family=self.hardware_family if self.hardware_family else 'Device',
>             hardware_type=' {}'.format(self.hardware_type) if self.hardware_type else '',
>-            version=VersionNameMap.map().to_name(self.software_version, platform=self.software_variant.lower()) if self.software_version else self.software_variant,
>+            version=version or self.software_variant,
>         )
> 
>     # This technique of matching treats 'None' a wild-card.
>Index: Tools/Scripts/webkitpy/xcode/device_type_unittest.py
>===================================================================
>--- Tools/Scripts/webkitpy/xcode/device_type_unittest.py	(revision 240963)
>+++ Tools/Scripts/webkitpy/xcode/device_type_unittest.py	(working copy)
>@@ -155,3 +155,6 @@ class DeviceTypeTest(unittest.TestCase):
>         self.assertTrue(DeviceType.from_string('iphone 6s') in DeviceType.from_string('iPhone'))
>         self.assertTrue(DeviceType.from_string('iPhone 6s') in DeviceType.from_string('iphone'))
>         self.assertTrue(DeviceType.from_string('iphone 6s') in DeviceType.from_string('iphone'))
>+
>+    def test_unmapped_version(self):
>+        self.assertEqual('iPhone running iOS', str(DeviceType.from_string('iPhone', Version(9))))

Actions: View | Formatted Diff | Diff

Attachments on bug 194133: 361195