Update to latest wptrunner.

This commit is contained in:
James Graham 2015-10-28 08:22:13 +09:00
parent bccede0370
commit 5998742e5d
5 changed files with 67 additions and 15 deletions

View file

@ -220,12 +220,11 @@ class Transport(object):
except Exception:
# This should probably be more specific
raise IOError
body = resp.read()
resp_body = resp.read()
try:
data = json.loads(body)
data = json.loads(resp_body)
except:
raise
raise WebDriverException("Could not parse response body as JSON: %s" % body)
if resp.status != 200:
@ -345,6 +344,24 @@ class Find(object):
return rv
class Cookies(object):
def __init__(self, session):
self.session = session
def __getitem__(self, name):
self.session.send_command("GET", "cookie/%s" % name, {}, key="value")
def __setitem__(self, name, value):
cookie = {"name": name,
"value": None}
if isinstance(name, (str, unicode)):
cookie["value"] = value
elif hasattr(value, "value"):
cookie["value"] = value.value
self.session.send_command("POST", "cookie/%s" % name, {}, key="value")
class Session(object):
def __init__(self, host, port, url_prefix="", desired_capabilities=None, port_timeout=60,
extension=None):
@ -496,7 +513,7 @@ class Session(object):
body["secure"] = secure
if expiry is not None:
body["expiry"] = expiry
self.send_command("POST", "cookie", body)
self.send_command("POST", "cookie", {"cookie": body})
def delete_cookie(self, name=None):
if name is None:
@ -593,7 +610,7 @@ class Element(object):
return self.session.send_command("GET", self.url("name"))
@command
def css(self, property_name):
def style(self, property_name):
return self.session.send_command("GET", self.url("css/%s" % property_name))
@property
@ -601,6 +618,10 @@ class Element(object):
def rect(self):
return self.session.send_command("GET", self.url("rect"))
@command
def attribute(self, name):
return self.session.send_command("GET", self.url("attribute/%s" % name))
class ServoExtensions(object):
def __init__(self, session):
self.session = session