Bug 1085208 - Move dom/media/tests/identity into dom/media/tests/mochitest to force it to run with the other Mochitests. r=jib
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Sat, 25 Oct 2014 20:27:41 +0300
changeset 212359 cfd10708c95b56f8b65440ae1b16907eaa2307f2
parent 212358 2db29c0ae60b6eb0e196165631127d195fe2ef0b
child 212360 9c2f6ec450f187e745c7d3def687851fd3c20f48
push id27707
push userphilringnalda@gmail.com
push dateSun, 26 Oct 2014 16:40:33 +0000
treeherdermozilla-central@cd9832b3a6f6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjib
bugs1085208
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1085208 - Move dom/media/tests/identity into dom/media/tests/mochitest to force it to run with the other Mochitests. r=jib
dom/media/moz.build
dom/media/tests/identity/identityevent.js
dom/media/tests/identity/idp-proxy.js
dom/media/tests/identity/idp.html
dom/media/tests/identity/mochitest.ini
dom/media/tests/identity/test_fingerprints.html
dom/media/tests/identity/test_getIdentityAssertion.html
dom/media/tests/identity/test_idpproxy.html
dom/media/tests/identity/test_peerConnection_peerIdentity.html
dom/media/tests/identity/test_setIdentityProvider.html
dom/media/tests/identity/test_setIdentityProviderWithErrors.html
dom/media/tests/mochitest/identity/identityevent.js
dom/media/tests/mochitest/identity/idp-proxy.js
dom/media/tests/mochitest/identity/idp.html
dom/media/tests/mochitest/identity/mochitest.ini
dom/media/tests/mochitest/identity/test_fingerprints.html
dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
dom/media/tests/mochitest/identity/test_idpproxy.html
dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
dom/media/tests/mochitest/identity/test_setIdentityProvider.html
dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -59,18 +59,18 @@ TEST_DIRS += [
     'compiledtest',
     'gtest',
 ]
 
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 MOCHITEST_MANIFESTS += [
     'test/mochitest.ini',
-    'tests/identity/mochitest.ini',
     'tests/ipc/mochitest.ini',
+    'tests/mochitest/identity/mochitest.ini',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
     MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
     WEBRTC_SIGNALLING_TEST_MANIFESTS += ['tests/mochitest/steeplechase.ini']
 
 XPIDL_SOURCES += [
     'nsIDOMNavigatorUserMedia.idl',
rename from dom/media/tests/identity/identityevent.js
rename to dom/media/tests/mochitest/identity/identityevent.js
rename from dom/media/tests/identity/idp-proxy.js
rename to dom/media/tests/mochitest/identity/idp-proxy.js
rename from dom/media/tests/identity/idp.html
rename to dom/media/tests/mochitest/identity/idp.html
rename from dom/media/tests/identity/mochitest.ini
rename to dom/media/tests/mochitest/identity/mochitest.ini
--- a/dom/media/tests/identity/mochitest.ini
+++ b/dom/media/tests/mochitest/identity/mochitest.ini
@@ -12,9 +12,9 @@ support-files =
 [test_idpproxy.html]
 [test_getIdentityAssertion.html]
 [test_setIdentityProvider.html]
 [test_setIdentityProviderWithErrors.html]
 [test_peerConnection_peerIdentity.html]
 [test_fingerprints.html]
 
 # Bug 950317: Hack for making a cleanup hook after finishing all WebRTC cases
-[../mochitest/test_zmedia_cleanup.html]
+[../test_zmedia_cleanup.html]
rename from dom/media/tests/identity/test_fingerprints.html
rename to dom/media/tests/mochitest/identity/test_fingerprints.html
rename from dom/media/tests/identity/test_getIdentityAssertion.html
rename to dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
--- a/dom/media/tests/identity/test_getIdentityAssertion.html
+++ b/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="../mochitest/head.js"></script>
-  <script type="application/javascript" src="../mochitest/pc.js"></script>
-  <script type="application/javascript" src="../mochitest/templates.js"></script>
+  <script type="application/javascript" src="../head.js"></script>
+  <script type="application/javascript" src="../pc.js"></script>
+  <script type="application/javascript" src="../templates.js"></script>
 </head>
 <body>
 <pre id="test">
 <script type="application/javascript">
   createHTML({
     title: "getIdentityAssertion Tests"
   });
 
rename from dom/media/tests/identity/test_idpproxy.html
rename to dom/media/tests/mochitest/identity/test_idpproxy.html
rename from dom/media/tests/identity/test_peerConnection_peerIdentity.html
rename to dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
--- a/dom/media/tests/identity/test_peerConnection_peerIdentity.html
+++ b/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta charset="utf-8"/>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="../mochitest/head.js"></script>
-  <script type="application/javascript" src="../mochitest/pc.js"></script>
-  <script type="application/javascript" src="../mochitest/templates.js"></script>
-  <script type="application/javascript" src="../mochitest/blacksilence.js"></script>
-  <script type="application/javascript" src="../mochitest/turnConfig.js"></script>
+  <script type="application/javascript" src="../head.js"></script>
+  <script type="application/javascript" src="../pc.js"></script>
+  <script type="application/javascript" src="../templates.js"></script>
+  <script type="application/javascript" src="../blacksilence.js"></script>
+  <script type="application/javascript" src="../turnConfig.js"></script>
 </head>
 <body>
 <div id="display"></div>
 <pre id="test">
 <script type="application/javascript">
   createHTML({
     title: "setIdentityProvider leads to peerIdentity and assertions in SDP"
   });
rename from dom/media/tests/identity/test_setIdentityProvider.html
rename to dom/media/tests/mochitest/identity/test_setIdentityProvider.html
--- a/dom/media/tests/identity/test_setIdentityProvider.html
+++ b/dom/media/tests/mochitest/identity/test_setIdentityProvider.html
@@ -1,17 +1,17 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta charset="utf-8"/>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="../mochitest/head.js"></script>
-  <script type="application/javascript" src="../mochitest/pc.js"></script>
-  <script type="application/javascript" src="../mochitest/templates.js"></script>
+  <script type="application/javascript" src="../head.js"></script>
+  <script type="application/javascript" src="../pc.js"></script>
+  <script type="application/javascript" src="../templates.js"></script>
   <script type="application/javascript" src="identityevent.js"></script>
 </head>
 <body>
 <pre id="test">
 <script type="application/javascript">
   createHTML({
     title: "setIdentityProvider leads to peerIdentity and assertions in SDP"
   });
rename from dom/media/tests/identity/test_setIdentityProviderWithErrors.html
rename to dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
--- a/dom/media/tests/identity/test_setIdentityProviderWithErrors.html
+++ b/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="../mochitest/head.js"></script>
-  <script type="application/javascript" src="../mochitest/pc.js"></script>
-  <script type="application/javascript" src="../mochitest/templates.js"></script>
+  <script type="application/javascript" src="../head.js"></script>
+  <script type="application/javascript" src="../pc.js"></script>
+  <script type="application/javascript" src="../templates.js"></script>
   <script type="application/javascript" src="identityevent.js"></script>
 </head>
 <body>
 <pre id="test">
 <script type="application/javascript">
   createHTML({
     title: "Identity Provider returning errors is handled correctly"
   });