mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #14050 - jdm:once-more-upgrade, r=KiChjang
Update wptrunner This unblocks #13418. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14050) <!-- Reviewable:end -->
This commit is contained in:
commit
0c6a277b09
6 changed files with 15 additions and 14 deletions
|
@ -1,2 +1 @@
|
|||
mozprocess >= 0.19
|
||||
|
||||
|
|
|
@ -130,6 +130,7 @@ class FirefoxBrowser(Browser):
|
|||
"marionette.defaultPrefs.port": self.marionette_port,
|
||||
"dom.disable_open_during_load": False,
|
||||
"network.dns.localDomains": ",".join(hostnames),
|
||||
"network.proxy.type": 0,
|
||||
"places.history.enabled": False})
|
||||
if self.e10s:
|
||||
self.profile.set_preferences({"browser.tabs.remote.autostart": True})
|
||||
|
|
|
@ -3,11 +3,12 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
var props = {output:%(output)d};
|
||||
|
||||
var start_loc = document.createElement('a');
|
||||
start_loc.href = location.href;
|
||||
setup(props);
|
||||
|
||||
add_completion_callback(function (tests, harness_status) {
|
||||
var id = location.pathname + location.search + location.hash;
|
||||
var id = start_loc.pathname + start_loc.search + start_loc.hash;
|
||||
console.log("ALERT: RESULT: " + JSON.stringify([
|
||||
id,
|
||||
harness_status.status,
|
||||
|
|
|
@ -16,6 +16,8 @@
|
|||
|
||||
# TODO: keep comments in the tree
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import types
|
||||
from cStringIO import StringIO
|
||||
|
||||
|
@ -48,8 +50,9 @@ atoms = {"True": True,
|
|||
"False": False,
|
||||
"Reset": object()}
|
||||
|
||||
def decode(byte_str):
|
||||
return byte_str.decode("utf8")
|
||||
def decode(s):
|
||||
assert isinstance(s, unicode)
|
||||
return s
|
||||
|
||||
|
||||
def precedence(operator_node):
|
||||
|
@ -76,7 +79,8 @@ class Tokenizer(object):
|
|||
|
||||
def tokenize(self, stream):
|
||||
self.reset()
|
||||
if type(stream) in types.StringTypes:
|
||||
assert not isinstance(stream, unicode)
|
||||
if isinstance(stream, str):
|
||||
stream = StringIO(stream)
|
||||
if not hasattr(stream, "name"):
|
||||
self.filename = ""
|
||||
|
@ -85,13 +89,15 @@ class Tokenizer(object):
|
|||
|
||||
self.next_line_state = self.line_start_state
|
||||
for i, line in enumerate(stream):
|
||||
assert isinstance(line, str)
|
||||
self.state = self.next_line_state
|
||||
assert self.state is not None
|
||||
states = []
|
||||
self.next_line_state = None
|
||||
self.line_number = i + 1
|
||||
self.index = 0
|
||||
self.line = line.rstrip()
|
||||
self.line = line.decode('utf-8').rstrip()
|
||||
assert isinstance(self.line, unicode)
|
||||
while self.state != self.eol_state:
|
||||
states.append(self.state)
|
||||
tokens = self.state()
|
||||
|
@ -474,7 +480,7 @@ class Tokenizer(object):
|
|||
value += self.escape_value(c)
|
||||
self.consume()
|
||||
|
||||
return unichr(value).encode("utf8")
|
||||
return unichr(value)
|
||||
|
||||
def escape_value(self, c):
|
||||
if '0' <= c <= '9':
|
||||
|
|
|
@ -11,9 +11,6 @@ from ..node import BinaryExpressionNode, BinaryOperatorNode, VariableNode, Numbe
|
|||
|
||||
|
||||
class TestConditional(unittest.TestCase):
|
||||
def parse(self, input_str):
|
||||
return self.parser.parse(StringIO(input_str))
|
||||
|
||||
def compile(self, input_text):
|
||||
return conditional.compile(input_text)
|
||||
|
||||
|
|
|
@ -13,9 +13,6 @@ from ..backends import static
|
|||
|
||||
|
||||
class TestStatic(unittest.TestCase):
|
||||
def parse(self, input_str):
|
||||
return self.parser.parse(StringIO(input_str))
|
||||
|
||||
def compile(self, input_text, input_data):
|
||||
return static.compile(input_text, input_data)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue