Commit Graph

12938 Commits

Author SHA1 Message Date
Wes Kocher
c21b854efc Merge inbound to central, a=merge 2016-09-12 17:08:25 -07:00
Gijs Kruitbosch
f3ce2c3276 Bug 1295292 - don't sort tpaint results, r=jmaher
MozReview-Commit-ID: 7jTgQOTHgvl

--HG--
extra : rebase_source : d2823ad545f02398d2fdf25d2fa98e3294540749
2016-09-12 13:39:10 +01:00
Henrik Skupin
a5af10f3a9 Bug 1301661 - Completely remove default value of 360s for socket_timeout r=maja_zf
MozReview-Commit-ID: 2xaWEAgSsTC

--HG--
extra : rebase_source : 4c9e806ba2d6513cfe755872c1b50741a1c7ff59
2016-09-12 13:03:06 +02:00
Phil Ringnalda
a21246e7d7 Merge m-c to autoland 2016-09-10 00:16:39 -07:00
Phil Ringnalda
3748f182f6 Merge m-i to m-c, a=merge 2016-09-10 00:14:21 -07:00
Edgar Chen
b255460f26 Bug 599975 - Fire error event for images with empty string src value; r=bz
MozReview-Commit-ID: AhXiTpgG9q3

--HG--
extra : rebase_source : fe03d94a08232e90a475529746b38b27c2591ec9
2016-09-08 16:27:03 +08:00
Patrick McManus
1d5bcef263 Bug 1301117 - update opportunisitic encryption r=hurley 2016-08-16 15:51:18 -04:00
Carsten "Tomcat" Book
0f2c669a48 merge mozilla-inbound to mozilla-central a=merge 2016-09-09 12:02:43 +02:00
Carsten "Tomcat" Book
89dba842cb merge fx-team to mozilla-central a=merge 2016-09-09 12:01:21 +02:00
Boris Zbarsky
2095bc6fba Bug 1301138. Set the one allowed sandbox navigator even when popups are allowed to escape the sandbox, so the new popup can be navigated by the sandboxed document. r=smaug
--HG--
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-1.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-2.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-3.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html
2016-09-08 00:17:11 -04:00
Boris Zbarsky
bcf43cc08c Bug 1097423. Fix raciness in the test. r=smaug 2016-09-08 17:47:30 -04:00
Henrik Skupin
fadd103e03 Bug 1301153 - Split-up marionette_test module into distinct modules. r=maja_zf
marionette_test.py is a bloated module which contains everything around the Marionette testcase classes.
We should split this up into distinct modules, so each new module covers specific code. The two new modules
introduced are errors, and decorators. This split would also be aligned to the structure of the driver.

To not loose backward compatibility we have to keep the import from marionette_test. It means the new
modules have to live in a sub folder named like that.

MozReview-Commit-ID: DQg55M258ST

--HG--
extra : rebase_source : 2c4150e56b4489518bd1c87b4c3f7cc25e0c5133
2016-09-07 22:58:36 +02:00
Rob Wu
a03dbe288b Bug 1300385 - Fix flaws in SimpleTest.isDeeply. r=Waldo
- When one of the parameters to isDeeply is an object/function
  and the other is not, isDeeply returned false. Well, isDeeply
  is supposed to report an error instead of returning a value...

- Change the implementation of isDeeply to have SameValue semantics
  instead of weak equality.

- Change the representation of arrays to look like an array, instead
  of its default toString() value which is indistinguishable from a
  string due to the lack of brackets and quotes.

- Account for missing object properties;
  Distinguish them from "undefined" with the special DNE tag.

MozReview-Commit-ID: F1OJhbXcptl

--HG--
extra : rebase_source : 26091a40445064da3f87d61438bd74bbe7491363
2016-09-03 22:00:45 -07:00
Phil Ringnalda
b33391adc0 Back out ec584a62ec26 (bug 918719) for Android failures in test_bug918719.html 2016-09-08 19:02:30 -07:00
Jessica Jong
c51974390f Bug 1278192 - Implement the value sanitizing algorithm for <input type=week>. r=smaug
--HG--
extra : source : 6ee805904d2d54728be175ddb60466acbb78c242
2016-09-08 15:39:01 -07:00
Thomas Wisniewski
89a07725ed Bug 918719 - Only fire one loading readystatechange per XHR, but keep the old behavior available behind the preference dom.send_multiple_xhr_loading_readystatechanges. r=smaug a=smaug
--HG--
extra : source : ea777ccca86cceeb53d2fc7252bea2a3bad3e405
2016-09-08 12:01:58 -04:00
Wes Kocher
b916384275 Merge inbound to m-c a=merge 2016-09-08 15:21:19 -07:00
Carsten "Tomcat" Book
e3c2ddf887 Merge mozilla-central to mozilla-inbound 2016-09-08 12:42:45 +02:00
Carsten "Tomcat" Book
f4a16a723a merge mozilla-inbound to mozilla-central a=merge 2016-09-08 12:01:17 +02:00
Carsten "Tomcat" Book
7dde8b7620 merge autoland to mozilla-central a=merge 2016-09-08 11:59:31 +02:00
Carsten "Tomcat" Book
38f7eb71e0 Backed out changeset d392d81c5b9e (bug 1297585) for breaking artifact desktop builds
--HG--
extra : rebase_source : 0a2e4754b68f2fd5ed98872c4b2981b18c37aa5a
2016-09-08 11:57:29 +02:00
Carsten "Tomcat" Book
8fca739250 Backed out changeset df7cb65bee39 (bug 1301138) for wpt test failures
--HG--
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-2.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping.html
2016-09-08 08:33:13 +02:00
Wes Kocher
5cbc382303 Merge inbound to m-c a=merge 2016-09-07 17:54:24 -07:00
Wes Kocher
46590574dc Merge autoland to central, a=merge 2016-09-07 17:26:48 -07:00
Wes Kocher
4c4ea87ae0 Backed out 2 changesets (bug 1283919) for being the wrong way to fix this a=backout
Backed out changeset a328778db08d (bug 1283919)
Backed out changeset 7e1f25f59298 (bug 1283919)
2016-09-07 14:22:21 -07:00
Carsten "Tomcat" Book
1c61ba654e merge mozilla-inbound to mozilla-central a=merge 2016-09-07 17:20:12 +02:00
Carsten "Tomcat" Book
7c6c7db247 Merge mozilla-central to autoland 2016-09-07 17:26:11 +02:00
Masayuki Nakano
af766dd2bc Bug 1291172 Add eQueryTextRectArray tests which compare with eQueryTextRect result r=smaug
eQueryTextRect is used by widget and eQueryTextRectArray is used by ContentCacheInChild.  So, matching their result guarantees that widget can get same result both in non-e10s mode and e10s mode.  So, the matching should be tested.

MozReview-Commit-ID: 6GfbyvZ9X7H

--HG--
extra : rebase_source : 12511d84cbd94b3f4edf42367a84ee45abc66d9e
2016-09-06 18:59:40 +09:00
Henrik Skupin
2a5371b154 Bug 1296175 - Remove broken timout code when pushing new permissions. r=ato
Because execute_async_script() has it's own timeout value, there shouldn't be another timeout
check inside the script. Even with this check we return immediately now, which can cause test
failures if setting the permission is delayed.

MozReview-Commit-ID: Aqsbfc6Ayy6

--HG--
extra : rebase_source : c1107a48644129d9e55ed07e049a60ad809d2ed0
2016-09-05 14:33:18 +02:00
Anjana Vakil
2876869ab9 Bug 1284238 - Test that manifest tests are filtered with correct settings; r=maja_zf
Add tests to ensure that the arguments passed to the call to
`manifest.active_tests` from within `runner.add_test` are correct,
based on the runner's settings for e.g. e10s and test tags.
Add helper function for setup for these tests to avoid duplication.


MozReview-Commit-ID: CsaDm7cSyZf

--HG--
extra : rebase_source : fe3687aea4d342962074bfef7f5c43385710f8fa
2016-09-08 14:20:28 +02:00
Anjana Vakil
20bb44fe7d Bug 1284238 - Split manifest fixture into non/parametrized versions; r=maja_zf
Move the ManifestFixture class out of the `manifest_fixture` function,
and rename that function to `manifest_with_tests`. Create a new,
simpler manifest fixture without parametrization, called `manifest`.

This allows us to use the mocking-out done in the ManifestFixture class
in tests where we don't actually need the parametrization of the
`active_tests` attribute.

MozReview-Commit-ID: xuBn4QxApf

--HG--
extra : rebase_source : c570086a6ec4556fc634f7e18f998a5fca042a01
2016-09-08 13:45:55 +02:00
Anjana Vakil
8cd4aa86a1 Bug 1285299 - Use pytest_mozlog plugin in Mn-h mozharness script; r=maja_zf
Modify the mozharness script for the Marionette harness tests
to use the new pytest_mozlog plugin, so that the logs produced
will be parseable by Treeherder.

Change the arguments passed to `pytest.main` to instruct pytest_mozlog
to write log files in TBPL, mach, and raw (structured log) formats.

Read the TBPL log into the mozharness script log itself,
and upload all pytest-mozlog log files to the default
blob upload dir as specified in the Mozharness BaseScript.

MozReview-Commit-ID: HoEK2M1XGwN

--HG--
extra : rebase_source : 9042d89c6ab2befefe945fdcfd6999c35b9d7340
2016-09-05 16:44:40 +02:00
Anjana Vakil
4168a526cd Bug 1285299 - Add pytest_mozlog plugin to mozlog; r=jgraham
Add the `pytest_mozlog` module (from https://github.com/davehunt/pytest-mozlog)
to mozbase/mozlog/mozlog, so that we can use it in the logging of the
Marionette harness tests.

Add an entry point for the plugin to mozlog/setup.py so that
when mozlog is installed, pytest will register the pytest_mozlog
plugin.py module as the plugin 'mozlog'.


Make the following modifications to pytest_mozlog/plugin.py:

- Disable stdout logging by default in pytest-mozlog

  In the pytest-mozlog plugin, disable logging to stdout by
  default when setting up the mozlog logger, so that the
  default output seen when using the plugin is just the
  Pytest terminal output. The user can specify a mozlog
  logger to write to stdout by using the '--log-* -' option,
  in which case both Pytest and pytest-mozlog will log to stdout.

- Record error msg and lineno in pytest-mozlog logs

  Extract the error message and line number for tests with failures/
  errors from the Pytest test report, and pass these to the Mozlog
  logs output by the pytest-mozlog plugin. For skipped tests,
  pass the skip reason, and for unexpected passes allow Mozlog to
  report its default message "expected FAIL".

- Report collected item count in pytest-mozlog

  Add/modify Pytest hooks in the pytest-mozlog plugin so that the
  suite_start event sent to the logger contains the correct list
  of tests to be run, i.e. items collected by Pytest, instead
  of an empty list. This allows mozlog to log the correct number
  of tests to be run.

- Log skipped/xfailed tests with corresponding status (not 'PASS')

  Log skipped tests with status 'SKIP' and expected failures
  that do indeed fail with status 'FAIL'/expected 'FAIL'
  so that these can be distinguished from true passing tests.

- Pass parsed arguments directly to mozlog.commandline.setup_logging

  Pass the entire Pytest config's argument namespace to `setup_logging`
  instead of copying over only the non-None formatters/formatter option
  arguments. Use the new `allow_unused_options` parameter to stop
  Mozlog from raising an error about options for unused formatters.

MozReview-Commit-ID: 4WpprytS5cI

--HG--
extra : rebase_source : 409de7a89e860471870e3adfd7634bc06f6e1873
2016-09-08 11:43:11 +02:00
Anjana Vakil
3e7feb1ea6 Bug 1285299 - Optionally ignore unused Mozlog formatter options; r=jgraham
Add a parameter `allow_unused_options` to the `setup_logging` and
`setup_handlers` methods in mozlog.commandline. When this parameter
is True, do not raise a ValueError in `setup_handlers` if the
command line arguments include formatter options for unused formatters.
(Default value is False.)

This allows parsed arguments from e.g. the pytest-mozlog plugin
to be passed directly to `setup_logging`, without filtering out
unused formatter options.

MozReview-Commit-ID: 8el0oaT4y1X

--HG--
extra : rebase_source : 0e969a783b1754885e6c25d35c552134773f1b5e
2016-09-07 20:55:21 +02:00
Jean-Yves Avenard
484bca8631 Bug 1300296: Use valid and spec-compliant MP4 file for all tests. r=gerald,jgraham
The MP4 used in the tests was invalid:
1- It contains out of order and overlapping frames
2- The first frame for each of the first 9 media segments were marked as keyframe, even though they weren't

The new file was encoded such that:
- The total bitrate remains the same as in the previous files
- The total duration is similar
- Each media segment starts with a valid keyframe
- Frames are properly ordered
- GOP is made of 24 frames
- The video track doesn't start at 0, which helps testing the proper behaviour regarding buffered range calculation.
- Like in the previous video, the audio track is present but made of silence (which is puzzling for a video initially designed to test A/V sync)

The webm file presents the same characteristics.

MozReview-Commit-ID: 6AKKmInaenE

--HG--
extra : rebase_source : e1ce95452a063872f345114ed19d57f19e0c08fc
2016-09-06 14:55:25 +10:00
Wes Kocher
ac33516b3c Merge m-c to autoland, a=merge 2016-09-07 18:07:50 -07:00
Boris Zbarsky
e664d8bcd3 Bug 1299373. Scripts with an empty src attribute should not execute. r=bkelly 2016-09-07 14:21:36 -04:00
Andrew McCreight
36c2e02c42 Back out de84b1059f7f (bug 1299871) because it doesn't help the issue it was supposed to. 2016-09-07 11:09:15 -07:00
Wes Kocher
573d1a9973 Merge m-c to autoland, a=merge 99ee305777f4 2016-09-07 17:25:26 -07:00
Henrik Skupin
a5a7c13571 Bug 1300776 - Add testing/marionette/harness to flake8 linter (except mixins, tests) . r=ahal
MozReview-Commit-ID: F9Hfze9zvzE

--HG--
extra : rebase_source : ddd2e63bf13967da1d66d49cbdd189b68e0e7402
2016-09-06 15:46:08 +02:00
Tom Tung
db38e2111a Bug 1187335 - P6 - Support script/css to set integrity metadata to serviceWorker. r=bkelly. r=francois. 2016-09-07 10:30:21 +08:00
Tom Tung
8b51370a4d Bug 1187335 - P5 - Adding new tests for SRI and enabling test for Request's integrity attribute in wpt. r=bkelly. 2016-09-07 10:38:59 +08:00
Jeremy Chen
722ad026a3 Bug 1297306 - part4:rename IsEnumFittingWithin with EnumTypeFitsWithin and move it to mfbt/EnumTypeTraits.h. r=froydnj
With this change, we could share this EnumTypeTraits between files easily.

MozReview-Commit-ID: 9Q2augati7l

--HG--
extra : rebase_source : b7d9fc95d9d7722ba3eb99ec9798a64ebdbeb484
2016-09-07 10:20:16 +08:00
Boris Zbarsky
128ebcc3ff Bug 1301138. Set the one allowed sandbox navigator even when popups are allowed to escape the sandbox, so the new popup can be navigated by the sandboxed document. r=smaug
--HG--
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-1.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-2.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html
rename : testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping.html => testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html
2016-09-08 00:17:11 -04:00
Wes Kocher
1989131fea Merge m-c to inbound, a=merge 2016-09-07 18:07:21 -07:00
Thomas Wisniewski
dadce88a58 Bug 918751 - Throw NetworkErrors instead of failures where appropriate for some XHR web platform tests. r=bz, r=keeler, r=Mossop, r=paul
--HG--
extra : rebase_source : 2d454dd6f7f66b0b2df44f6f4ce3740d8f6de04c
2016-09-03 18:45:08 -04:00
Andrew Halberstadt
97f0fbd35d Bug 1300163 - Add support for Android mochitests to interactive loaners, r=armenzg
This will allow developers to request a loaner for an Android mochitest job and then use
|mach mochitest| to run tests.

MozReview-Commit-ID: 4lsKGpizfH7

--HG--
extra : rebase_source : fba9adb6e2d50cc9ac27532bc91b5eb1d909d874
2016-09-02 14:43:53 -04:00
Andrew Halberstadt
4fecf32869 Bug 1300163 - Reuse the 'e10s' value from the mozharness config on interactive loaners, r=armenzg
I noticed that if you request a loaner for a non-e10s job then run mach, it will be run with e10s
enabled. The mach command should accurately reflect the type of job that got requested. This patch
grabs the 'e10s' argument from the mozharness localconfig.json and uses that.

MozReview-Commit-ID: 4lsKGpizfH7

--HG--
extra : rebase_source : 6f7b45146bb7f3431c242d92b4206d41f7217c03
2016-09-02 14:42:36 -04:00
Andrew Halberstadt
fb05814e0d Bug 1300163 - Lazy load certain mach context attributes using the 'key' mechanism, r=armenzg
You can set attributes on a mach context by using the 'key' argument to the context_handler. Basically,
whatever gets returned by the handler when <key> is passed in, will get set (i.e cached) on the context
object for fast retrieval next time. This is a way to lazy load these attributes.

Previously I was setting functions like 'find_firefox()' on the context object, and then having the
mach_commands call that directly. But this way is much cleaner.

Now, the loaded 'mozharness_config' can be stored as an attribute on the context. Also 'find_firefox()'
is now an attribute called 'firefox_bin'.

MozReview-Commit-ID: 4lsKGpizfH7

--HG--
extra : rebase_source : af5e32e05a29b8e91d4cd0005689baa8079ec137
2016-09-02 14:35:14 -04:00
Andrew Halberstadt
feb9ec8140 Bug 1300163 - Fix hidden tracebacks in mochitest runtests.py, r=armenzg
I had a mistake in my code that resulted in an exception being thrown when starting the
mochitest servers. However, the log just showed a timeout. It was very confusing.

After some digging, I found that there's a large try/finally block (with no except) in
runtests.py. The exception wasn't being displayed because of the finally block. This
try/finally block had an inner try/except/finally that wrapped part of the code. This
patch simply removes that inner block and dedents the 'except' clause to attach to the
original try/finally.

MozReview-Commit-ID: 4lsKGpizfH7

--HG--
extra : rebase_source : 9d55b967c8384498a4d104730a7bb91c4885bbea
2016-09-02 14:39:34 -04:00