diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/image.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/image.py deleted file mode 100644 index 31dd61d9b86e..000000000000 --- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/image.py +++ /dev/null @@ -1,100 +0,0 @@ -import os, sys, array, json, math, cStringIO -sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) -import mozresource; subresource = mozresource - -class Image: - """This class partially implements the interface of the PIL.Image.Image. - One day in the future WPT might support the PIL module or another imaging - library, so this hacky BMP implementation will no longer be required. - """ - def __init__(self, width, height): - self.width = width - self.height = height - self.img = bytearray([0 for i in range(3 * width * height)]) - - @staticmethod - def new(mode, size, color=0): - return Image(size[0], size[1]) - - def _int_to_bytes(self, number): - packed_bytes = [0, 0, 0, 0] - for i in range(4): - packed_bytes[i] = number & 0xFF - number >>= 8 - - return packed_bytes - - def putdata(self, color_data): - for y in range(self.height): - for x in range(self.width): - i = x + y * self.width - if i > len(color_data) - 1: - return - - self.img[i * 3: i * 3 + 3] = color_data[i][::-1] - - def save(self, f, type): - assert type == "BMP" - # 54 bytes of preambule + image color data. - filesize = 54 + 3 * self.width * self.height; - # 14 bytes of header. - bmpfileheader = bytearray(['B', 'M'] + self._int_to_bytes(filesize) + - [0, 0, 0, 0, 54, 0, 0, 0]) - # 40 bytes of info. - bmpinfoheader = bytearray([40, 0, 0, 0] + - self._int_to_bytes(self.width) + - self._int_to_bytes(self.height) + - [1, 0, 24] + (25 * [0])) - - padlength = (4 - (self.width * 3) % 4) % 4 - bmppad = bytearray([0, 0, 0]); - padding = bmppad[0 : padlength] - - f.write(bmpfileheader) - f.write(bmpinfoheader) - - for i in range(self.height): - offset = self.width * (self.height - i - 1) * 3 - f.write(self.img[offset : offset + 3 * self.width]) - f.write(padding) - -def encode_string_as_bmp_image(string_data): - data_bytes = array.array("B", string_data) - num_bytes = len(data_bytes) - - # Convert data bytes to color data (RGB). - color_data = [] - num_components = 3 - rgb = [0] * num_components - i = 0 - for byte in data_bytes: - component_index = i % num_components - rgb[component_index] = byte - if component_index == (num_components - 1) or i == (num_bytes - 1): - color_data.append(tuple(rgb)) - rgb = [0] * num_components - i += 1 - - # Render image. - num_pixels = len(color_data) - sqrt = int(math.ceil(math.sqrt(num_pixels))) - img = Image.new("RGB", (sqrt, sqrt), "black") - img.putdata(color_data) - - # Flush image to string. - f = cStringIO.StringIO() - img.save(f, "BMP") - f.seek(0) - - return f.read() - -def generate_payload(server_data): - data = ('{"headers": %(headers)s}') % server_data - return encode_string_as_bmp_image(data) - -def main(request, response): - subresource.respond(request, - response, - payload_generator = generate_payload, - content_type = "image/bmp", - access_control_allow_origin = "*") diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/script.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/script.py deleted file mode 100644 index 907236ccc05f..000000000000 --- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/script.py +++ /dev/null @@ -1,13 +0,0 @@ -import os, sys, json -sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) -import mozresource; subresource = mozresource - -def generate_payload(server_data): - return subresource.get_template("script.js.template") % server_data - -def main(request, response): - subresource.respond(request, - response, - payload_generator = generate_payload, - content_type = "application/javascript") - diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/worker.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/worker.py deleted file mode 100644 index 2d2067bde7d3..000000000000 --- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/worker.py +++ /dev/null @@ -1,12 +0,0 @@ -import os, sys, json -sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) -import mozresource; subresource = mozresource - -def generate_payload(server_data): - return subresource.get_template("worker.js.template") % server_data - -def main(request, response): - subresource.respond(request, - response, - payload_generator = generate_payload, - content_type = "application/javascript") diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/xhr.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/xhr.py deleted file mode 100755 index 3ec8fdb082b4..000000000000 --- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/xhr.py +++ /dev/null @@ -1,15 +0,0 @@ -import os, sys, json -sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) -import mozresource; subresource = mozresource - -def generate_payload(server_data): - data = ('{"headers": %(headers)s}') % server_data - return data - -def main(request, response): - subresource.respond(request, - response, - payload_generator = generate_payload, - access_control_allow_origin = "*", - content_type = "application/json") - diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json b/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json index fb0b81054cf4..ac4a86af04d6 100644 --- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json +++ b/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json @@ -297,28 +297,6 @@ ], "excluded_tests":[ - { - "name": "cross-origin-workers", - "expansion": "*", - "source_protocol": "*", - "target_protocol": "*", - "redirection": "*", - "delivery_method": "*", - "origin": "cross-origin", - "subresource": "worker-request", - "referrer_url": "*" - }, - { - "name": "upgraded-protocol-workers", - "expansion": "*", - "source_protocol": "http", - "target_protocol": "https", - "delivery_method": "*", - "redirection": "*", - "origin": "*", - "subresource": "worker-request", - "referrer_url": "*" - }, { "name": "mixed-content-insecure-subresources", "expansion": "*", @@ -330,22 +308,6 @@ "subresource": "*", "referrer_url": "*" }, - { - "name": "elements-not-supporting-attr-referrer", - "expansion": "*", - "source_protocol": "*", - "target_protocol": "*", - "delivery_method": ["attr-referrer"], - "redirection": "*", - "origin": "*", - "subresource": [ - "script-tag", - "xhr-request", - "worker-request", - "fetch-request" - ], - "referrer_url": "*" - }, { "name": "elements-not-supporting-rel-noreferrer", "expansion": "*", @@ -354,48 +316,7 @@ "delivery_method": ["rel-noreferrer"], "redirection": "*", "origin": "*", - "subresource": [ - "iframe-tag", - "img-tag", - "script-tag", - "xhr-request", - "worker-request", - "fetch-request", - "area-tag" - ], - "referrer_url": "*" - }, - { - "name": "area-tag", - "expansion": "*", - "source_protocol": "*", - "target_protocol": "*", - "delivery_method": "*", - "redirection": "*", - "origin": "*", - "subresource": "area-tag", - "referrer_url": "*" - }, - { - "name": "worker-requests-with-swap-origin-redirect", - "expansion": "*", - "source_protocol": "*", - "target_protocol": "*", - "delivery_method": "*", - "redirection": "swap-origin-redirect", - "origin": "*", - "subresource": ["worker-request"], - "referrer_url": "*" - }, - { - "name": "overhead-for-redirection", - "expansion": "*", - "source_protocol": "*", - "target_protocol": "*", - "delivery_method": "*", - "redirection": ["keep-origin-redirect", "swap-origin-redirect"], - "origin": "*", - "subresource": ["a-tag", "area-tag"], + "subresource": "*", "referrer_url": "*" }, { @@ -457,14 +378,7 @@ ], "subresource": [ - "iframe-tag", - "img-tag", - "script-tag", - "a-tag", - "area-tag", - "xhr-request", - "worker-request", - "fetch-request" + "iframe-tag" ], "referrer_url": [ @@ -475,13 +389,6 @@ }, "subresource_path": { - "a-tag": "/referrer-policy/generic/subresource/document.py", - "area-tag": "/referrer-policy/generic/subresource/document.py", - "fetch-request": "/referrer-policy/generic/subresource/xhr.py", - "iframe-tag": "/referrer-policy/generic/subresource/document.py", - "img-tag": "/referrer-policy/generic/subresource/image.py", - "script-tag": "/referrer-policy/generic/subresource/script.py", - "worker-request": "/referrer-policy/generic/subresource/worker.py", - "xhr-request": "/referrer-policy/generic/subresource/xhr.py" + "iframe-tag": "/referrer-policy/generic/subresource/document.py" } }