Skip to content

Commit

Permalink
Relicense wptrunner under the same license as web-platform-tests. (#254)
Browse files Browse the repository at this point in the history
See https://bugzilla.mozilla.org/show_bug.cgi?id=1351364 for
permission grants from all contributors.
  • Loading branch information
jgraham authored Apr 20, 2017
1 parent 8796c49 commit 262a2a1
Show file tree
Hide file tree
Showing 73 changed files with 34 additions and 288 deletions.
30 changes: 30 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
W3C 3-clause BSD License

http://www.w3.org/Consortium/Legal/2008/03-bsd-license.html

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of works must retain the original copyright notice,
this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the original copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

* Neither the name of the W3C nor the names of its contributors may be
used to endorse or promote products derived from this work without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
classifiers=['Development Status :: 4 - Beta',
'Environment :: Console',
'Intended Audience :: Developers',
'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent'],
package_data={"wptrunner": ["executors/testharness_marionette.js",
"executors/testharness_webdriver.js",
Expand Down
3 changes: 0 additions & 3 deletions wptrunner/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4 changes: 0 additions & 4 deletions wptrunner/browsers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

"""Subpackage where each product is defined. Each product is created by adding a
a .py file containing a __wptrunner__ variable in the global scope. This must be
a dictionary with the fields
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/browsers/base.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import platform
import socket
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/browsers/chrome.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

from .base import Browser, ExecutorBrowser, require_arg
from ..webdriver_server import ChromeDriverServer
from ..executors import executor_kwargs as base_executor_kwargs
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/browsers/edge.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

from .base import Browser, ExecutorBrowser, require_arg
from ..webdriver_server import EdgeDriverServer
from ..executors import executor_kwargs as base_executor_kwargs
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/browsers/firefox.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import platform
import signal
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/browsers/sauce.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import sys
import urlparse
Expand Down
7 changes: 0 additions & 7 deletions wptrunner/browsers/server-locations.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# See /build/pgo/server-locations.txt for documentation on the format

http://localhost:8000 primary

http://web-platform.test:8000
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/browsers/servo.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import os

from .base import NullBrowser, ExecutorBrowser, require_arg
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/browsers/servodriver.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import subprocess
import tempfile
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/config.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import ConfigParser
import os
import sys
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/environment.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import json
import os
import multiprocessing
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

from base import (executor_kwargs,
testharness_result_converter,
reftest_result_converter,
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/base.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import hashlib
import json
import os
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/executormarionette.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import hashlib
import httplib
import os
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/executorselenium.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import socket
import sys
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/executorservo.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import base64
import hashlib
import httplib
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/executorservodriver.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import json
import os
import socket
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/process.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

from .base import TestExecutor


Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/pytestrunner/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

from .runner import run
4 changes: 0 additions & 4 deletions wptrunner/executors/pytestrunner/runner.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

"""Provides interface to deal with pytest.
Usage::
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/reftest-wait.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

function test(x) {
log("classList: " + root.classList);
if (!root.classList.contains("reftest-wait")) {
Expand Down
5 changes: 0 additions & 5 deletions wptrunner/executors/reftest-wait_servodriver.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

callback = arguments[arguments.length - 1];

function check_done() {
Expand Down
10 changes: 3 additions & 7 deletions wptrunner/executors/reftest-wait_webdriver.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

var callback = arguments[arguments.length - 1];

function test(x) {
if (!root.classList.contains("reftest-wait")) {
observer.disconnect();

// As of 2017-04-05, the Chromium web browser exhibits a rendering bug
// (https://bugs.chromium.org/p/chromium/issues/detail?id=708757) that
// produces instability during screen capture. The following use of
Expand All @@ -16,10 +12,10 @@ function test(x) {
//
// For further detail, see:
// https://github.com/jugglinmike/chrome-screenshot-race/issues/1

requestAnimationFrame(function() {
requestAnimationFrame(function() {
callback();
callback();
});
});
}
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/reftest.js
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

var win = window.open("about:blank", "test", "width=600,height=600");
4 changes: 0 additions & 4 deletions wptrunner/executors/testharness_marionette.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

window.wrappedJSObject.timeout_multiplier = %(timeout_multiplier)d;
window.wrappedJSObject.explicit_timeout = %(explicit_timeout)d;

Expand Down
4 changes: 0 additions & 4 deletions wptrunner/executors/testharness_servodriver.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

window.__wd_results_callback__ = arguments[arguments.length - 1];
window.__wd_results_timer__ = setTimeout(timeout, %(timeout)s);
4 changes: 0 additions & 4 deletions wptrunner/executors/testharness_webdriver.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

var callback = arguments[arguments.length - 1];
window.timeout_multiplier = %(timeout_multiplier)d;

Expand Down
4 changes: 0 additions & 4 deletions wptrunner/expected.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import os


Expand Down
4 changes: 0 additions & 4 deletions wptrunner/hosts.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

from __future__ import unicode_literals


Expand Down
4 changes: 0 additions & 4 deletions wptrunner/manifestexpected.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import urlparse

Expand Down
4 changes: 0 additions & 4 deletions wptrunner/manifestinclude.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

"""Manifest structure used to store paths that should be included in a test run.
The manifest is represented by a tree of IncludeManifest objects, the root
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/manifestupdate.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import urlparse
from collections import namedtuple, defaultdict
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/metadata.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import shutil
import sys
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/products.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import importlib
import imp
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/reduce.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import sys
import tempfile
from cStringIO import StringIO
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/testharnessreport-servo.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

var props = {output:%(output)d};
var start_loc = document.createElement('a');
start_loc.href = location.href;
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/testharnessreport-servodriver.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

setup({output:%(output)d});

add_completion_callback(function() {
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/testharnessreport.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

var props = {output:%(output)d,
explicit_timeout: true,
message_events: ["completion"]};
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/testrunner.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

from __future__ import unicode_literals

import multiprocessing
Expand Down
3 changes: 0 additions & 3 deletions wptrunner/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
4 changes: 0 additions & 4 deletions wptrunner/tests/test_chunker.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import unittest
import sys
from os.path import join, dirname
Expand Down
4 changes: 0 additions & 4 deletions wptrunner/tests/test_hosts.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.

import unittest
import sys
from os.path import join, dirname
Expand Down
Loading

0 comments on commit 262a2a1

Please sign in to comment.