Move viewport_percentage_vw_vh_a.html and viewport_percentage_vw_vh_b.html to wpt reftests.

This commit is contained in:
Ms2ger 2015-12-28 12:40:02 +01:00
parent 797b21eaf1
commit 796c77df33
7 changed files with 86 additions and 11 deletions

View file

@ -123,26 +123,29 @@ class RefTest(URLManifestItem):
item_type = "reftest"
def __init__(self, source_file, url, references, url_base="/", timeout=None,
manifest=None):
viewport_size=None, manifest=None):
URLManifestItem.__init__(self, source_file, url, url_base=url_base, manifest=manifest)
for _, ref_type in references:
if ref_type not in ["==", "!="]:
raise ValueError, "Unrecognised ref_type %s" % ref_type
self.references = tuple(references)
self.timeout = timeout
self.viewport_size = viewport_size
@property
def is_reference(self):
return self.source_file.name_is_reference
def meta_key(self):
return (self.timeout,)
return (self.timeout, self.viewport_size)
def to_json(self):
rv = URLManifestItem.to_json(self)
rv["references"] = self.references
if self.timeout is not None:
rv["timeout"] = self.timeout
if self.viewport_size is not None:
rv["viewport_size"] = self.viewport_size
return rv
@classmethod
@ -153,6 +156,7 @@ class RefTest(URLManifestItem):
obj["references"],
url_base=manifest.url_base,
timeout=obj.get("timeout"),
viewport_size=obj.get("viewport_size"),
manifest=manifest)