diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
| commit | 6bd66b1728eeddb058066edda740aaeb2ceaec23 (patch) | |
| tree | 985faf01c526763515731569fa01a99f4dbef36e /testing | |
| parent | e0a8dcfed131ffa58a5e2cb1d30fe48c745c2fdc (diff) | |
| parent | 559824514dc95e02fbe81f1786e6ac13ee8e9d55 (diff) | |
| download | UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.gz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.lz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.xz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.zip | |
Merge branch 'master' into js-modules
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/mozharness/requirements.txt | 6 | ||||
| -rw-r--r-- | testing/web-platform/meta/html/dom/interfaces.html.ini | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/testing/mozharness/requirements.txt b/testing/mozharness/requirements.txt index 632355c54..9314abfee 100644 --- a/testing/mozharness/requirements.txt +++ b/testing/mozharness/requirements.txt @@ -8,12 +8,12 @@ dulwich==0.8.7 hg-git==0.4.0 logilab-astng==0.24.2 logilab-common==0.59.0 -mercurial==3.7.3 +mercurial ~> 4.1.3 mock==1.0.1 nose==1.2.1 ordereddict==1.1 -paramiko==1.10.0 -pycrypto==2.6 +paramiko ~> 1.17.6 +pycrypto > 2.6.1 pyflakes==0.6.1 pylint==0.27.0 simplejson==2.1.1 diff --git a/testing/web-platform/meta/html/dom/interfaces.html.ini b/testing/web-platform/meta/html/dom/interfaces.html.ini index 8dbbe4969..59e445a3e 100644 --- a/testing/web-platform/meta/html/dom/interfaces.html.ini +++ b/testing/web-platform/meta/html/dom/interfaces.html.ini @@ -1594,9 +1594,6 @@ [Path2D interface: operation addPathByStrokingText(DOMString,CanvasDrawingStyles,SVGMatrix,Path2D,unrestricted double)] expected: FAIL - [DataTransfer interface object length] - expected: FAIL - [Window interface: operation showModalDialog(DOMString,any)] disabled: if e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=981796 |