From 5540610f3d3c3c6e72527814d06a3cef05d6f130 Mon Sep 17 00:00:00 2001
From: Gregory Arndt <garndt@mozilla.com>
Date: Tue, 17 Nov 2015 14:40:31 -0600
Subject: [PATCH] Bug 1223394 - Use desktop-test image for Mulet mochitests to
 fix audio issues, r=aus, a=philor

--HG--
extra : rebase_source : 73bb5268f8be0ac64eda5b083f05543913ce10b7
---
 .../webspeech/recognition/test/mochitest.ini  |  2 +-
 .../tasks/tests/mulet_mochitests.yml          | 44 +++++++++++++------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/dom/media/webspeech/recognition/test/mochitest.ini b/dom/media/webspeech/recognition/test/mochitest.ini
index 4eb06f83e201..15e4582e09ac 100644
--- a/dom/media/webspeech/recognition/test/mochitest.ini
+++ b/dom/media/webspeech/recognition/test/mochitest.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 tags=msg
-skip-if = buildapp == 'b2g' || buildapp == 'mulet' # Bug 1191270, bug 1037287, bug 967606, bug 1096400, etc
+skip-if = buildapp == 'b2g' # Bug 1191270, bug 1037287, bug 967606, bug 1096400, etc
 support-files =
   head.js
   hello.ogg
diff --git a/testing/taskcluster/tasks/tests/mulet_mochitests.yml b/testing/taskcluster/tasks/tests/mulet_mochitests.yml
index 55ec7838c054..af9686a0ca76 100644
--- a/testing/taskcluster/tasks/tests/mulet_mochitests.yml
+++ b/testing/taskcluster/tasks/tests/mulet_mochitests.yml
@@ -1,24 +1,42 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Mulet Mochitests ( {{chunk}} )'
     description: Mulet Mochitest run {{chunk}}
+  scopes:
+    - 'docker-worker:cache:tc-vcs'
+    - 'docker-worker:cache:linux-cache'
+    - 'docker-worker:capability:device:loopbackVideo'
+    - 'docker-worker:capability:device:loopbackAudio'
   payload:
+    image: '{{#docker_image}}desktop-test{{/docker_image}}'
+    cache:
+      # So pip installs are cached...
+      linux-cache: /home/worker/.cache
+      tc-vcs: '/home/worker/.tc-vcs'
+    capabilities:
+      devices:
+        loopbackVideo: true
+        loopbackAudio: true
+    env:
+      NEED_XVFB: true
+      NEED_PULSEAUDIO: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
+      MOZHARNESS_CONFIG: >
+        mozharness/configs/unittests/linux_unittest.py
+        mozharness/configs/remove_executables.py
     command:
-      - entrypoint # entrypoint ensures we are running in xvfb
-      - >
-        python ./mozharness/scripts/desktop_unittest.py
-        --no-read-buildbot-config
-        --config-file ./mozharness/configs/unittests/linux_unittest.py
-        --config-file ./mozharness_configs/remove_executables.py
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --download-symbols ondemand
-        --mochitest-suite plain-chunked
-        --total-chunk={{total_chunks}}
-        --this-chunk={{chunk}}
+      - bash
+      - /home/worker/bin/test.sh
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --download-symbols=ondemand
+      - --mochitest-suite=plain-chunked
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
     artifacts:
       'public/build':
         type: directory