Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-20 12:55:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update web-platform-tests to revision 7a767a52741f628430ffbbed46e7f3df68ba3534

Browse source 
Fixes #15648.
This commit is contained in:
Ms2ger 2017-02-20 11:44:42 +01:00
parent a1e4c547f0
commit 4fadf9b0b6
1184 changed files with 22551 additions and 9856 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/wpt/web-platform-tests/tools/runner/runner.js
View file

@ -644,8 +644,10 @@ Runner.prototype = {
return this.manifest[this.mTestCount];
},
open_test_window: function() {
this.test_window = window.open("about:blank", 800, 600);
ensure_test_window: function() {
if (!this.test_window || this.test_window.location === null) {
this.test_window = window.open("about:blank", 800, 600);
}
},
manifest_loaded: function() {
@ -666,6 +668,7 @@ Runner.prototype = {
this.manifest_iterator = new ManifestIterator(this.manifest, this.path, this.test_types, this.use_regex);
this.num_tests = null;
this.ensure_test_window();
if (this.manifest.data === null) {
this.wait_for_manifest();
} else {
@ -682,7 +685,6 @@ Runner.prototype = {
do_start: function() {
if (this.manifest_iterator.count() > 0) {
this.open_test_window();
this.start_callbacks.forEach(function(callback) {
callback();
});
@ -727,6 +729,7 @@ Runner.prototype = {
this.done_flag = true;
if (this.test_window) {
this.test_window.close();
this.test_window = undefined;
}
this.done_callbacks.forEach(function(callback) {
callback();
@ -758,9 +761,7 @@ Runner.prototype = {
},
load: function(path) {
if (this.test_window.location === null) {
this.open_test_window();
}
this.ensure_test_window();
this.test_window.location.href = this.server + path;
},

14
tests/wpt/web-platform-tests/tools/sslutils/openssl.py
View file

@ -4,7 +4,12 @@ import random
import shutil
import subprocess
import tempfile
from datetime import datetime
from datetime import datetime, timedelta
# Amount of time beyond the present to consider certificates "expired." This
# allows certificates to be proactively re-generated in the "buffer" period
# prior to their exact expiration time.
CERT_EXPIRY_BUFFER = dict(hours=6)
class OpenSSL(object):
def __init__(self, logger, binary, base_path, conf_path, hosts, duration,
@ -305,8 +310,11 @@ class OpenSSLEnvironment(object):
"-in", cert_path).split("=", 1)[1].strip()
# Not sure if this works in other locales
end_date = datetime.strptime(end_date_str, "%b %d %H:%M:%S %Y %Z")
# Should have some buffer here e.g. 1 hr
if end_date < datetime.now():
time_buffer = timedelta(**CERT_EXPIRY_BUFFER)
# Because `strptime` does not account for time zone offsets, it is
# always in terms of UTC, so the current time should be calculated
# accordingly.
if end_date < datetime.utcnow() + time_buffer:
return False
#TODO: check the key actually signed the cert.