Bug 1067305: Conditionally disable media mochitests that won't run wi…

…th the Windows content sandbox at low integrity. r=jmaher
dothq · Oct 9, 2014 · 0bd51a2 · 0bd51a2
1 parent 02cf7c3
commit 0bd51a2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/content/media/test/mochitest.ini b/content/media/test/mochitest.ini
@@ -22,7 +22,7 @@
 # do ok(true, "Type not supported") and stop the test.
 
 [DEFAULT]
-skip-if = buildapp == 'mulet'
+skip-if = buildapp == 'mulet' || (os == 'win' && contentSandbox != 'off') # contentSandbox(Bug 1042735)
 support-files =
   320x240.ogv
   320x240.ogv^headers^

diff --git a/content/media/webaudio/test/mochitest.ini b/content/media/webaudio/test/mochitest.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && (toolkit != 'gonk' || debug)) #b2g-debug,b2g-desktop(bug 916135)
+skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && (toolkit != 'gonk' || debug)) || (os == 'win' && contentSandbox != 'off') #b2g-debug,b2g-desktop(bug 916135); contentSandbox(Bug 1042735)
 support-files =
   audio-expected.wav
   audio-mono-expected-2.wav

diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = (os == 'win' && contentSandbox != 'off') # contentSandbox(Bug 1042735)
 support-files =
   head.js
   constraints.js