Bug 1089037 - Removing invalid mochitests and moving webapprt-content tests to a seperate "webapprtContent" folder in object directory. r=jmaher, marco

python/mozbuild/mozbuild/frontend/context.py

@@ -991,6 +991,10 @@ VARIABLES = {
         """List of manifest files defining mochitest tests.
         """, None),
 
+    'MOCHITEST_WEBAPPRT_CONTENT_MANIFESTS': (StrictOrderingOnAppendList, list,
+        """List of manifest files defining webapprt mochitest content tests.
+        """, None),
+
     'MOCHITEST_WEBAPPRT_CHROME_MANIFESTS': (StrictOrderingOnAppendList, list,
         """List of manifest files defining webapprt mochitest chrome tests.
         """, None),

python/mozbuild/mozbuild/frontend/emitter.py

@@ -774,6 +774,7 @@ class TreeMetadataEmitter(LoggingMixin):
             METRO_CHROME=('metro-chrome', 'testing/mochitest', 'metro', True),
             MOCHITEST=('mochitest', 'testing/mochitest', 'tests', True),
             MOCHITEST_CHROME=('chrome', 'testing/mochitest', 'chrome', True),
+            MOCHITEST_WEBAPPRT_CONTENT=('webapprt-content', 'testing/mochitest', 'webapprtContent', True),
             MOCHITEST_WEBAPPRT_CHROME=('webapprt-chrome', 'testing/mochitest', 'webapprtChrome', True),
             WEBRTC_SIGNALLING_TEST=('steeplechase', 'steeplechase', '.', True),
             XPCSHELL_TESTS=('xpcshell', 'xpcshell', '.', True),

testing/mochitest/runtests.py

@@ -515,6 +515,8 @@ class MochitestUtilsMixin(object):
         self.urlOpts.append("timeout=%d" % options.timeout)
       if options.closeWhenDone:
         self.urlOpts.append("closeWhenDone=1")
+      if options.webapprtContent:
+        self.urlOpts.append("testRoot=webapprtContent")
       if options.logFile:
         self.urlOpts.append("logFile=" + encodeURIComponent(options.logFile))
         self.urlOpts.append("fileLevel=" + encodeURIComponent(options.fileLevel))
@@ -575,6 +577,8 @@ class MochitestUtilsMixin(object):
       return "a11y"
     elif options.webapprtChrome:
       return "webapprt-chrome"
+    elif options.webapprtContent:
+      return "webapprt-content"
     else:
       return "mochitest"
 
@@ -630,6 +634,8 @@ class MochitestUtilsMixin(object):
         self.testRoot = 'a11y'
       elif options.webapprtChrome:
         self.testRoot = 'webapprtChrome'
+      elif options.webapprtContent:
+        self.testRoot = 'webapprtContent'
       elif options.chrome:
         self.testRoot = 'chrome'
       else:

testing/mochitest/tests/SimpleTest/setup.js

@@ -76,6 +76,8 @@ if (params.testRoot == "browser") {
   params.testPrefix = "chrome://mochitests/content/chrome/";
 } else if (params.testRoot == "a11y") {
   params.testPrefix = "chrome://mochitests/content/a11y/";
+} else if (params.testRoot == "webapprtContent") {
+  params.testPrefix = "/webapprtContent/";
 } else {
   params.testPrefix = "/tests/";
 }

webapprt/content/mochitest.js

@@ -20,7 +20,7 @@ WebappRT.config = {
 
 Cu.import("resource://gre/modules/Webapps.jsm");
 
-becomeWebapp("http://mochi.test:8888/tests/webapprt/test/content/test.webapp",
+becomeWebapp("http://mochi.test:8888/webapprtContent/webapprt/test/content/test.webapp",
              undefined, function onBecome() {
   if (window.arguments && window.arguments[0]) {
     let testUrl = window.arguments[0].QueryInterface(Ci.nsIPropertyBag2).get("url");

webapprt/moz.build

@@ -37,7 +37,7 @@ MOCHITEST_WEBAPPRT_CHROME_MANIFESTS += [
     'test/chrome/downloads/webapprt.ini',
     'test/chrome/webapprt.ini',
 ]
-MOCHITEST_MANIFESTS += ['test/content/mochitest.ini']
+MOCHITEST_WEBAPPRT_CONTENT_MANIFESTS += ['test/content/webapprt.ini']
 
 # Place webapprt resources in a separate app dir
 DIST_SUBDIR = 'webapprt'