mirror of
https://github.com/servo/servo.git
synced 2025-08-26 15:48:22 +01:00
Update CSS tests to revision 7d0ff6117ee51720c307ea24d413d13eb5abf3e6
This commit is contained in:
parent
40c52d55e2
commit
349c75536d
7391 changed files with 304135 additions and 153491 deletions
|
@ -5,6 +5,7 @@ from collections import defaultdict
|
|||
from item import item_types, ManualTest, WebdriverSpecTest, Stub, RefTest, TestharnessTest
|
||||
from log import get_logger
|
||||
from sourcefile import SourceFile
|
||||
from utils import from_os_path, to_os_path
|
||||
|
||||
|
||||
CURRENT_VERSION = 2
|
||||
|
@ -207,7 +208,7 @@ class Manifest(object):
|
|||
for item_type, items in self._data.iteritems()
|
||||
}
|
||||
|
||||
reftest_nodes = {key:[v.to_json() for v in value]
|
||||
reftest_nodes = {from_os_path(key): [v.to_json() for v in value]
|
||||
for key, value in self.reftest_nodes.iteritems()}
|
||||
|
||||
rv = {"url_base": self.url_base,
|
||||
|
@ -246,6 +247,7 @@ class Manifest(object):
|
|||
self._add(manifest_item)
|
||||
|
||||
for path, values in obj["reftest_nodes"].iteritems():
|
||||
path = to_os_path(path)
|
||||
for v in values:
|
||||
item = RefTest.from_json(self, tests_root, v,
|
||||
source_files=source_files)
|
||||
|
@ -306,17 +308,16 @@ class LocalChanges(object):
|
|||
return self._data[item_type]
|
||||
|
||||
def to_json(self):
|
||||
reftest_nodes = {key:[v.to_json() for v in value]
|
||||
reftest_nodes = {from_os_path(key): [v.to_json() for v in value]
|
||||
for key, value in self.reftest_nodes.iteritems()}
|
||||
|
||||
rv = {"items": defaultdict(dict),
|
||||
"reftest_nodes": reftest_nodes,
|
||||
"deleted": []}
|
||||
|
||||
rv["deleted"].extend(self._deleted)
|
||||
"deleted": [from_os_path(path) for path in self._deleted]}
|
||||
|
||||
for test_type, paths in self._data.iteritems():
|
||||
for path, tests in paths.iteritems():
|
||||
path = from_os_path(path)
|
||||
rv["items"][test_type][path] = [test.to_json() for test in tests]
|
||||
|
||||
return rv
|
||||
|
@ -343,6 +344,7 @@ class LocalChanges(object):
|
|||
self.add(manifest_item)
|
||||
|
||||
for path, values in obj["reftest_nodes"].iteritems():
|
||||
path = to_os_path(path)
|
||||
for v in values:
|
||||
item = RefTest.from_json(self.manifest, tests_root, v,
|
||||
source_files=source_files)
|
||||
|
@ -350,25 +352,30 @@ class LocalChanges(object):
|
|||
self.reftest_nodes_by_url[item.url] = item
|
||||
|
||||
for item in obj["deleted"]:
|
||||
self.add_deleted(item)
|
||||
self.add_deleted(to_os_path(item))
|
||||
|
||||
return self
|
||||
|
||||
def load(tests_root, manifest_path):
|
||||
def load(tests_root, manifest):
|
||||
logger = get_logger()
|
||||
|
||||
if os.path.exists(manifest_path):
|
||||
logger.debug("Opening manifest at %s" % manifest_path)
|
||||
else:
|
||||
logger.debug("Creating new manifest at %s" % manifest_path)
|
||||
try:
|
||||
with open(manifest_path) as f:
|
||||
manifest = Manifest.from_json(tests_root, json.load(f))
|
||||
except IOError:
|
||||
manifest = Manifest(None)
|
||||
# "manifest" is a path or file-like object.
|
||||
if isinstance(manifest, basestring):
|
||||
if os.path.exists(manifest):
|
||||
logger.debug("Opening manifest at %s" % manifest)
|
||||
else:
|
||||
logger.debug("Creating new manifest at %s" % manifest)
|
||||
try:
|
||||
with open(manifest) as f:
|
||||
rv = Manifest.from_json(tests_root, json.load(f))
|
||||
except IOError:
|
||||
rv = Manifest(None)
|
||||
return rv
|
||||
|
||||
return Manifest.from_json(tests_root, json.load(manifest))
|
||||
|
||||
return manifest
|
||||
|
||||
def write(manifest, manifest_path):
|
||||
with open(manifest_path, "w") as f:
|
||||
with open(manifest_path, "wb") as f:
|
||||
json.dump(manifest.to_json(), f, sort_keys=True, indent=2, separators=(',', ': '))
|
||||
f.write("\n")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue