Back out 90758efa9a09 (bug 1017865) because the expectAssertions() it removed actually do happen

CLOSED TREE
This commit is contained in:
Phil Ringnalda 2015-03-16 21:34:09 -07:00
parent fb8d3b759a
commit 0287002547
2 changed files with 4 additions and 1 deletions

View File

@ -4,7 +4,7 @@
# Mark failing tests in mochi-single.html.
[DEFAULT]
skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g')) || ((os == 'linux') && (buildapp == 'mulet'))
skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g')) || ((os == 'linux') && (buildapp == 'mulet')) # Bug 1136181 disabled on B2G Desktop and Mulet for intermittent failures
support-files = webgl-conformance/../webgl-mochitest/driver-info.js
webgl-conformance/always-fail.html

View File

@ -14,6 +14,9 @@
src='../mochi-single.html?conformance/textures/texture-npot-video.html'>
</iframe>
<script>
if (navigator.userAgent.contains("Android")) {
SimpleTest.expectAssertions(4); // bug 1143227
}
SimpleTest.requestFlakyTimeout("untriaged");
IFrameAutoresize.StartById('mochi-single', false);
</script>