Making it possible to import mediastream tests.

Tools/Scripts/webkitpy/w3c/test_converter.py

 #!/usr/bin/env python
 
 # Copyright (C) 2013 Adobe Systems Incorporated. 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
@@ skipping 50 matching lines @@
         self._webkit_root = WebKitFinder(self._filesystem).webkit_base()
 
         self.converted_data = []
         self.converted_properties = []
         self.in_style_tag = False
         self.style_data = []
         self.filename = filename
 
         resources_path = self.path_from_webkit_root('LayoutTests', 'resources')
         resources_relpath = self._filesystem.relpath(resources_path, new_path)
-        self.new_test_harness_path = resources_relpath
+        self.resources_relpath = resources_relpath
 
         # These settings might vary between WebKit and Blink
         self._css_property_file = self.path_from_webkit_root('Source', 'core', 'css', 'CSSPropertyNames.in')
         self._css_property_split_string = 'alias_for='
 
         self.prefixed_properties = self.read_webkit_prefixed_css_property_list()
 
-        self.test_harness_re = re.compile('/resources/testharness')
-
         self.prefixed_properties = self.read_webkit_prefixed_css_property_list()
         prop_regex = '([\s{]|^)(' + "|".join(prop.replace('-webkit-', '') for prop in self.prefixed_properties) + ')(\s+:|:)'
         self.prop_re = re.compile(prop_regex)
 
     def output(self):
         return (self.converted_properties, ''.join(self.converted_data))
 
     def path_from_webkit_root(self, *comps):
         return self._filesystem.abspath(self._filesystem.join(self._webkit_root, *comps))
 
@@ skipping 40 matching lines @@
 
     def convert_style_data(self, data):
         converted = self.add_webkit_prefix_to_unprefixed_properties(data)
         if converted[0]:
             self.converted_properties.extend(list(converted[0]))
         return converted[1]
 
     def convert_attributes_if_needed(self, tag, attrs):
         converted = self.get_starttag_text()
         if tag in ('script', 'link'):
-            attr_name = 'src'
+            target_attr = 'src'
             if tag != 'script':
-                attr_name = 'href'
-            for attr in attrs:
-                if attr[0] == attr_name:
-                    new_path = re.sub(self.test_harness_re, self.new_test_harness_path + '/testharness', attr[1])
-                    converted = re.sub(attr[1], new_path, converted)
+                target_attr = 'href'
+            for attr_name, attr_value in attrs:
+                if attr_name == target_attr:
+                    new_path = re.sub('/resources/testharness',
+                                      self.resources_relpath + '/testharness',
+                                      attr_value)
+                    converted = re.sub(attr_value, new_path, converted)
+                    new_path = re.sub('/common/vendor-prefix',

[Dirk Pranke, 2014/06/26 21:16:47]

I don't recall if you answered this question, but why do we need this script at
all rather than just converting the prefixes as part of the import like we do
for other things?

As I noted in the email thread, having two mechanisms for this doesn't seem
ideal.

+                                      self.resources_relpath + '/vendor-prefix',
+                                      attr_value)
+                    converted = re.sub(attr_value, new_path, converted)
 
-        for attr in attrs:
-            if attr[0] == 'style':
-                new_style = self.convert_style_data(attr[1])
-                converted = re.sub(attr[1], new_style, converted)
+        for attr_name, attr_value in attrs:
+            print attr_name, attr_value

[Dirk Pranke, 2014/06/26 21:16:47]

this print shouldn't be here ...

+            if attr_name == 'style':
+                new_style = self.convert_style_data(attr_value)
+                converted = re.sub(attr_value, new_style, converted)
+            if attr_name == 'class' and 'instructions' in attr_value:

[Dirk Pranke, 2014/06/26 21:16:47]

can we put this logic in testharnessreport.js instead?

+                # Always hide instructions, they're for manual testers.
+                converted = re.sub(' style=".*?"', '', converted)
+                converted = re.sub('\>', ' style="display:none">', converted)
 
         self.converted_data.append(converted)
 
     def handle_starttag(self, tag, attrs):
         if tag == 'style':
             self.in_style_tag = True
         self.convert_attributes_if_needed(tag, attrs)
 
     def handle_endtag(self, tag):
         if tag == 'style':
@@ skipping 19 matching lines @@
 
     def handle_comment(self, data):
         self.converted_data.extend(['<!-- ', data, ' -->'])
 
     def handle_decl(self, decl):
         self.converted_data.extend(['<!', decl, '>'])
 
     def handle_pi(self, data):
         self.converted_data.extend(['<?', data, '>'])