Bug 1264343 - Only run test_peerConnection_scaleResolution.html with VP8 codec on Android; r=jib draft
authorDan Minor <dminor@mozilla.com>
Fri, 07 Apr 2017 08:42:23 -0400
changeset 561472 cae3251f489e45f56b04378074083d6b4fd24666
parent 554498 31810a9548fcede48be099fc9823fd2710616d64
child 623977 b80db3cc8610dd2babcbe63b2c4aad349d4e06d2
push id53732
push userdminor@mozilla.com
push dateWed, 12 Apr 2017 17:36:44 +0000
reviewersjib
bugs1264343
milestone55.0a1
Bug 1264343 - Only run test_peerConnection_scaleResolution.html with VP8 codec on Android; r=jib We don't currently support H.264 on Android in automation, but we can improve our test coverage by running the VP8 portion of this test in the meantime. MozReview-Commit-ID: 3SPCTaqlfMk
dom/media/tests/mochitest/test_peerConnection_scaleResolution.html
testing/mochitest/manifests/autophone-webrtc.ini
--- a/dom/media/tests/mochitest/test_peerConnection_scaleResolution.html
+++ b/dom/media/tests/mochitest/test_peerConnection_scaleResolution.html
@@ -72,14 +72,19 @@
       .then(() => {
         stream.getTracks().forEach(track => track.stop());
         v1.srcObject = v2.srcObject = null;
       })
     })
     .catch(generateErrorCallback());
   }
 
-  runNetworkTest(() => testScale("VP8").then(() => testScale("H264"))
-                 .then(networkTestFinished));
+  if (!navigator.appVersion.includes("Android")) {
+    runNetworkTest(() => testScale("VP8").then(() => testScale("H264"))
+                   .then(networkTestFinished));
+  } else {
+    // No support for H.264 on Android in automation, see Bug 1355786
+    runNetworkTest(() => testScale("VP8").then(networkTestFinished));
+  }
 </script>
 </pre>
 </body>
 </html>
--- a/testing/mochitest/manifests/autophone-webrtc.ini
+++ b/testing/mochitest/manifests/autophone-webrtc.ini
@@ -109,17 +109,16 @@ skip-if = true # Bug 1222983
 [../tests/dom/media/tests/mochitest/test_peerConnection_removeThenAddAudioTrackNoBundle.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_removeThenAddVideoTrack.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_removeThenAddVideoTrackNoBundle.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_removeVideoTrack.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html]
 skip-if = true  # Bug 1189784
 [../tests/dom/media/tests/mochitest/test_peerConnection_replaceVideoThenRenegotiate.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_scaleResolution.html]
-skip-if = true # Bug 1264343
 [../tests/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInHaveLocalOffer.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInStable.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_setLocalOfferInHaveRemoteOffer.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_setParameters.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInStable.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_setRemoteOfferInHaveLocalOffer.html]
 [../tests/dom/media/tests/mochitest/test_peerConnection_simulcastOffer.html]