Bug 1468198 - remove tests that only run on b2g. r=smaug,mcmanus,whimboo
authorJoel Maher <jmaher@mozilla.com>
Wed, 27 Jun 2018 09:52:19 -0400
changeset 479028 8ea86c82810eb5f99e875083ca1548b43082701d
parent 479027 0be300394024d07621c28ac80135f41d47e18895
child 479029 194d57fb47585d05b90efbedf85fb61fc6c9084e
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug, mcmanus, whimboo
bugs1468198
milestone63.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 1468198 - remove tests that only run on b2g. r=smaug,mcmanus,whimboo
dom/events/test/marionette/head.js
dom/events/test/marionette/manifest.ini
dom/events/test/marionette/test_sensor_orientation.js
dom/network/tests/marionette/head.js
dom/network/tests/marionette/manifest.ini
dom/network/tests/marionette/test_ethernet_add_interface.js
dom/network/tests/marionette/test_ethernet_connect_with_dhcp.js
dom/network/tests/marionette/test_ethernet_connect_with_static_ip.js
dom/network/tests/marionette/test_ethernet_disable.js
dom/network/tests/marionette/test_ethernet_disconnect.js
dom/network/tests/marionette/test_ethernet_enable.js
dom/network/tests/marionette/test_ethernet_ip_mode_change.js
dom/network/tests/marionette/test_ethernet_reconnect_with_dhcp.js
dom/network/tests/marionette/test_ethernet_reconnect_with_static_ip.js
dom/network/tests/marionette/test_ethernet_remove_interface.js
python/mozbuild/mozbuild/action/test_archive.py
python/mozbuild/mozbuild/frontend/context.py
testing/marionette/harness/marionette_harness/tests/webapi-tests.ini
testing/marionette/moz.build
deleted file mode 100644
--- a/dom/events/test/marionette/head.js
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const {Cc: Cc, Ci: Ci, Cr: Cr, Cu: Cu} = SpecialPowers;
-
-
-var _pendingEmulatorCmdCount = 0;
-
-/**
- * Send emulator command with safe guard.
- *
- * We should only call |finish()| after all emulator command transactions
- * end, so here comes with the pending counter.  Resolve when the emulator
- * gives positive response, and reject otherwise.
- *
- * Fulfill params:
- *   result -- an array of emulator response lines.
- * Reject params:
- *   result -- an array of emulator response lines.
- *
- * @return A deferred promise.
- */
-function runEmulatorCmdSafe(aCommand) {
-  return new Promise((resolve, reject) => {
-
-    ++_pendingEmulatorCmdCount;
-    runEmulatorCmd(aCommand, function(aResult) {
-      --_pendingEmulatorCmdCount;
-
-      ok(true, "Emulator response: " + JSON.stringify(aResult));
-      if (Array.isArray(aResult) &&
-          aResult[aResult.length - 1] === "OK") {
-        resolve(aResult);
-      } else {
-        reject(aResult);
-      }
-    });
-
-  });
-}
-
-/**
- * Get emulator sensor values of a named sensor.
- *
- * Fulfill params:
- *   result -- an array of emulator sensor values.
- * Reject params: (none)
- *
- * @param aSensorName
- *        A string name of the sensor.  Availables are: "acceleration"
- *        "magnetic-field", "orientation", "temperature", "proximity".
- *
- * @return A deferred promise.
- */
-function getEmulatorSensorValues(aSensorName) {
-  return runEmulatorCmdSafe("sensor get " + aSensorName)
-    .then(function(aResult) {
-      // aResult = ["orientation = 0:0:0", "OK"]
-      return aResult[0].split(" ")[2].split(":").map(function(aElement) {
-        return parseInt(aElement, 10);
-      });
-    });
-}
-
-/**
- * Convenient alias function for getting orientation sensor values.
- */
-function getEmulatorOrientationValues() {
-  return getEmulatorSensorValues("orientation");
-}
-
-/**
- * Set emulator orientation sensor values.
- *
- * Fulfill params: (none)
- * Reject params: (none)
- *
- * @param aAzimuth
- * @param aPitch
- * @param aRoll
- *
- * @return A deferred promise.
- */
-function setEmulatorOrientationValues(aAzimuth, aPitch, aRoll) {
-  let cmd = "sensor set orientation " + aAzimuth + ":" + aPitch + ":" + aRoll;
-  return runEmulatorCmdSafe(cmd);
-}
-
-/**
- * Wait for a named window event.
- *
- * Resolve if that named event occurs.  Never reject.
- *
- * Forfill params: the DOMEvent passed.
- *
- * @param aEventName
- *        A string event name.
- *
- * @return A deferred promise.
- */
-function waitForWindowEvent(aEventName) {
-  return new Promise(resolve => {
-
-    window.addEventListener(aEventName, function(aEvent) {
-      ok(true, "Window event '" + aEventName + "' got.");
-      resolve(aEvent);
-    }, {once: true});
-
-  });
-}
-
-/**
- * Wait for pending emulator transactions and call |finish()|.
- */
-function cleanUp() {
-  // Use ok here so that we have at least one test run.
-  ok(true, ":: CLEANING UP ::");
-
-  waitFor(finish, function() {
-    return _pendingEmulatorCmdCount === 0;
-  });
-}
-
-/**
- * Basic test routine helper.
- *
- * This helper does nothing but clean-ups.
- *
- * @param aTestCaseMain
- *        A function that takes no parameter.
- */
-function startTestBase(aTestCaseMain) {
-  Promise.resolve()
-    .then(aTestCaseMain)
-    .then(cleanUp, function() {
-      ok(false, 'promise rejects during test.');
-      cleanUp();
-    });
-}
deleted file mode 100644
--- a/dom/events/test/marionette/manifest.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-run-if = buildapp == 'b2g'
-
-[test_sensor_orientation.js]
deleted file mode 100644
--- a/dom/events/test/marionette/test_sensor_orientation.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 120000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-function doTest(aAzimuth, aPitch, aRoll) {
-  log("Testing [azimuth, pitch, roll] = " + Array.slice(arguments));
-
-  return setEmulatorOrientationValues(aAzimuth, aPitch, aRoll)
-    .then(() => waitForWindowEvent("deviceorientation"))
-    .then(function(aEvent) {
-      is(aEvent.alpha, aAzimuth, "azimuth");
-      is(aEvent.beta,  aPitch, "pitch");
-      is(aEvent.gamma, aRoll, "roll");
-    });
-}
-
-function testAllPermutations() {
-  const angles = [-180, -90, 0, 90, 180];
-  let promise = Promise.resolve();
-  for (let i = 0; i < angles.length; i++) {
-    for (let j = 0; j < angles.length; j++) {
-      for (let k = 0; k < angles.length; k++) {
-        promise =
-          promise.then(doTest.bind(null, angles[i], angles[j], angles[k]));
-      }
-    }
-  }
-  return promise;
-}
-
-startTestBase(function() {
-  let origValues;
-
-  return Promise.resolve()
-
-    // Retrieve original status.
-    .then(() => getEmulatorOrientationValues())
-    .then(function(aValues) {
-      origValues = aValues;
-      is(typeof origValues, "object", "typeof origValues");
-      is(origValues.length, 3, "origValues.length");
-    })
-
-    // Test original status
-    .then(() => doTest.apply(null, origValues))
-
-    .then(testAllPermutations)
-
-    // Restore original status.
-    .then(() => setEmulatorOrientationValues.apply(null, origValues));
-});
deleted file mode 100644
--- a/dom/network/tests/marionette/head.js
+++ /dev/null
@@ -1,551 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-
-const ETHERNET_MANAGER_CONTRACT_ID = "@mozilla.org/ethernetManager;1";
-
-const INTERFACE_UP = "UP";
-const INTERFACE_DOWN = "DOWN";
-
-let gTestSuite = (function() {
-  let suite = {};
-
-  // Private member variables of the returned object |suite|.
-  let ethernetManager = SpecialPowers.Cc[ETHERNET_MANAGER_CONTRACT_ID]
-                                     .getService(SpecialPowers.Ci.nsIEthernetManager);
-  let pendingEmulatorShellCount = 0;
-
-  /**
-   * Send emulator shell command with safe guard.
-   *
-   * We should only call |finish()| after all emulator command transactions
-   * end, so here comes with the pending counter.  Resolve when the emulator
-   * gives positive response, and reject otherwise.
-   *
-   * Fulfill params: an array of emulator response lines.
-   * Reject params: an array of emulator response lines.
-   *
-   * @param command
-   *        A string command to be passed to emulator through its telnet console.
-   *
-   * @return A deferred promise.
-   */
-  function runEmulatorShellSafe(command) {
-    return new Promise((resolve, reject) => {
-
-      ++pendingEmulatorShellCount;
-      runEmulatorShell(command, function(aResult) {
-        --pendingEmulatorShellCount;
-
-        ok(true, "Emulator shell response: " + JSON.stringify(aResult));
-        if (Array.isArray(aResult)) {
-          resolve(aResult);
-        } else {
-          reject(aResult);
-        }
-      });
-
-    });
-  }
-
-  /**
-   * Get the system network conifg by the given interface name.
-   *
-   * Use shell command 'netcfg' to get the list of network cofig.
-   *
-   * Fulfill params: An object of { name, flag, ip }
-   *
-   * @parm ifname
-   *       Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function getNetworkConfig(ifname) {
-    return runEmulatorShellSafe(['netcfg'])
-      .then(result => {
-        // Sample 'netcfg' output:
-        //
-        // lo       UP                                   127.0.0.1/8   0x00000049 00:00:00:00:00:00
-        // eth0     UP                                   10.0.2.15/24  0x00001043 52:54:00:12:34:56
-        // eth1     DOWN                                   0.0.0.0/0   0x00001002 52:54:00:12:34:57
-        // rmnet1   DOWN                                   0.0.0.0/0   0x00001002 52:54:00:12:34:59
-
-        let config;
-
-        for (let i = 0; i < result.length; i++) {
-          let tokens = result[i].split(/\s+/);
-          let name = tokens[0];
-          let flag = tokens[1];
-          let ip = tokens[2].split(/\/+/)[0];
-          if (name == ifname) {
-            config = { name: name, flag: flag, ip: ip };
-            break;
-          }
-        }
-
-        return config;
-      });
-  }
-
-  /**
-   * Get the ip assigned by dhcp server of a given interface name.
-   *
-   * Get the ip from android property 'dhcp.[ifname].ipaddress'.
-   *
-   * Fulfill params: A string of ip address.
-   *
-   * @parm ifname
-   *       Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function getDhcpIpAddr(ifname) {
-    return runEmulatorShellSafe(['getprop', 'dhcp.' + ifname + '.ipaddress'])
-      .then(function(ipAddr) {
-        return ipAddr[0];
-      });
-  }
-
-  /**
-   * Get the gateway assigned by dhcp server of a given interface name.
-   *
-   * Get the ip from android property 'dhcp.[ifname].gateway'.
-   *
-   * Fulfill params: A string of gateway.
-   *
-   * @parm ifname
-   *       Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function getDhcpGateway(ifname) {
-    return runEmulatorShellSafe(['getprop', 'dhcp.' + ifname + '.gateway'])
-      .then(function(gateway) {
-        return gateway[0];
-      });
-  }
-
-  /**
-   * Get the default route.
-   *
-   * Use shell command 'ip route' to get the default of device.
-   *
-   * Fulfill params: An array of { name, gateway }
-   *
-   * @return A deferred promise.
-   */
-  function getDefaultRoute() {
-    return runEmulatorShellSafe(['ip', 'route'])
-      .then(result => {
-        // Sample 'ip route' output:
-        //
-        // 10.0.2.0/24 dev eth0  proto kernel  scope link  src 10.0.2.15
-        // default via 10.0.2.2 dev eth0  metric 2
-
-        let routeInfo = [];
-
-        for (let i = 0; i < result.length; i++) {
-          if (!result[i].match('default')) {
-            continue;
-          }
-
-          let tokens = result[i].split(/\s+/);
-          let name = tokens[4];
-          let gateway = tokens[2];
-          routeInfo.push({ name: name, gateway: gateway });
-        }
-
-        return routeInfo;
-      });
-  }
-
-  /**
-   * Check a specific interface is enabled or not.
-   *
-   * @parm ifname
-   *       Interface name.
-   * @parm enabled
-   *       A boolean value used to check interface is disable or not.
-   *
-   * @return A deferred promise.
-   */
-  function checkInterfaceIsEnabled(ifname, enabled) {
-    return getNetworkConfig(ifname)
-      .then(function(config) {
-        if (enabled) {
-          is(config.flag, INTERFACE_UP, "Interface is enabled as expected.");
-        } else {
-          is(config.flag, INTERFACE_DOWN, "Interface is disabled as expected.");
-        }
-      });
-  }
-
-  /**
-   * Check the ip of a specific interface is equal to given ip or not.
-   *
-   * @parm ifname
-   *       Interface name.
-   * @parm ip
-   *       Given ip address.
-   *
-   * @return A deferred promise.
-   */
-  function checkInterfaceIpAddr(ifname, ip) {
-    return getNetworkConfig(ifname)
-      .then(function(config) {
-        is(config.ip, ip, "IP is right as expected.");
-      });
-  }
-
-  /**
-   * Check the default gateway of a specific interface is equal to given gateway
-   * or not.
-   *
-   * @parm ifname
-   *       Interface name.
-   * @parm gateway
-   *       Given gateway.
-   *
-   * @return A deferred promise.
-   */
-  function checkDefaultRoute(ifname, gateway) {
-    return getDefaultRoute()
-      .then(function(routeInfo) {
-        for (let i = 0; i < routeInfo.length; i++) {
-          if (routeInfo[i].name == ifname) {
-            is(routeInfo[i].gateway, gateway,
-               "Default gateway is right as expected.");
-            return true;
-          }
-        }
-
-        if (!gateway) {
-          ok(true, "Default route is cleared.");
-          return true;
-        }
-
-        // TODO: should we ok(false, ......) here?
-        return false;
-      });
-  }
-
-  /**
-   * Check the length of interface list in EthernetManager is equal to given
-   * length or not.
-   *
-   * @parm length
-   *       Given length.
-   */
-  function checkInterfaceListLength(length) {
-    let list = ethernetManager.interfaceList;
-    is(length, list.length, "List length is equal as expected.");
-  }
-
-  /**
-   * Check the given interface exists on device or not.
-   *
-   * @parm ifname
-   *       Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function checkInterfaceExist(ifname) {
-    return scanInterfaces()
-      .then(list => {
-        let index = list.indexOf(ifname);
-        if (index < 0) {
-          throw "Interface " + ifname + " not found.";
-        }
-
-        ok(true, ifname + " exists.");
-      });
-  }
-
-  /**
-   * Scan for available ethernet interfaces.
-   *
-   * Fulfill params: A list of available interfaces found in device.
-   *
-   * @return A deferred promise.
-   */
-  function scanInterfaces() {
-    return new Promise(resolve => {
-
-      ethernetManager.scan(function onScan(list) {
-        resolve(list);
-      });
-
-    });
-  }
-
-  /**
-   * Add an interface into interface list.
-   *
-   * Fulfill params: A boolean value indicates success or not.
-   *
-   * @param ifname
-   *        Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function addInterface(ifname) {
-    return new Promise(resolve => {
-
-      ethernetManager.addInterface(ifname, function onAdd(success, message) {
-        ok(success, "Add interface " + ifname + " succeeded.");
-        is(message, "ok", "Message is as expected.");
-
-        resolve(success);
-      });
-
-    });
-  }
-
-  /**
-   * Remove an interface form the interface list.
-   *
-   * Fulfill params: A boolean value indicates success or not.
-   *
-   * @param ifname
-   *        Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function removeInterface(ifname) {
-    return new Promise(resolve => {
-
-      ethernetManager.removeInterface(ifname, function onRemove(success, message) {
-        ok(success, "Remove interface " + ifname + " succeeded.");
-        is(message, "ok", "Message is as expected.");
-
-        resolve(success);
-      });
-
-    });
-  }
-
-  /**
-   * Enable networking of an interface in the interface list.
-   *
-   * Fulfill params: A boolean value indicates success or not.
-   *
-   * @param ifname
-   *        Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function enableInterface(ifname) {
-    return new Promise(resolve => {
-
-      ethernetManager.enable(ifname, function onEnable(success, message) {
-        ok(success, "Enable interface " + ifname + " succeeded.");
-        is(message, "ok", "Message is as expected.");
-
-        resolve(success);
-      });
-
-    });
-  }
-
-  /**
-   * Disable networking of an interface in the interface list.
-   *
-   * Fulfill params: A boolean value indicates success or not.
-   *
-   * @param ifname
-   *        Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function disableInterface(ifname) {
-    return new Promise(resolve => {
-
-      ethernetManager.disable(ifname, function onDisable(success, message) {
-        ok(success, "Disable interface " + ifname + " succeeded.");
-        is(message, "ok", "Message is as expected.");
-
-        resolve(success);
-      });
-
-    });
-  }
-
-  /**
-   * Make an interface connect to network.
-   *
-   * Fulfill params: A boolean value indicates success or not.
-   *
-   * @param ifname
-   *        Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function makeInterfaceConnect(ifname) {
-    return new Promise(resolve => {
-
-      ethernetManager.connect(ifname, function onConnect(success, message) {
-        ok(success, "Interface " + ifname + " is connected successfully.");
-        is(message, "ok", "Message is as expected.");
-
-        resolve(success);
-      });
-
-    });
-  }
-
-  /**
-   * Make an interface disconnect to network.
-   *
-   * Fulfill params: A boolean value indicates success or not.
-   *
-   * @param ifname
-   *        Interface name.
-   *
-   * @return A deferred promise.
-   */
-  function makeInterfaceDisconnect(ifname) {
-    return new Promise(resolve => {
-
-      ethernetManager.disconnect(ifname, function onDisconnect(success, message) {
-        ok(success, "Interface " + ifname + " is disconnected successfully.");
-        is(message, "ok", "Message is as expected.");
-
-        resolve(success);
-      });
-
-    });
-  }
-
-  /**
-   * Update the config the an interface in the interface list.
-   *
-   * @param ifname
-   *        Interface name.
-   * @param config
-   *        .ip: ip address.
-   *        .prefixLength: mask length.
-   *        .gateway: gateway.
-   *        .dnses: dnses.
-   *        .httpProxyHost: http proxy host.
-   *        .httpProxyPort: http porxy port.
-   *        .usingDhcp: an boolean value indicates using dhcp or not.
-   *
-   * @return A deferred promise.
-   */
-  function updateInterfaceConfig(ifname, config) {
-    return new Promise(resolve => {
-
-      ethernetManager.updateInterfaceConfig(ifname, config,
-                                            function onUpdated(success, message) {
-        ok(success, "Interface " + ifname + " config is updated successfully " +
-                    "with " + JSON.stringify(config));
-        is(message, "ok", "Message is as expected.");
-
-        resolve(success);
-      });
-
-    });
-  }
-
-  /**
-   * Wait for timeout.
-   *
-   * @param timeout
-   *        Time in ms.
-   *
-   * @return A deferred promise.
-   */
-  function waitForTimeout(timeout) {
-    return new Promise(resolve => {
-
-      setTimeout(function() {
-        ok(true, "waitForTimeout " + timeout);
-        resolve();
-      }, timeout);
-
-    });
-  }
-
-  /**
-   * Wait for default route of a specific interface being set and
-   * check.
-   *
-   * @param ifname
-   *        Interface name.
-   * @param gateway
-   *        Target gateway.
-   *
-   * @return A deferred promise.
-   */
-  function waitForDefaultRouteSet(ifname, gateway) {
-    return gTestSuite.waitForTimeout(500)
-      .then(() => gTestSuite.checkDefaultRoute(ifname, gateway))
-      .then(success => {
-        if (success) {
-          ok(true, "Default route is set as expected." + gateway);
-          return;
-        }
-
-        ok(true, "Default route is not set yet, check again. " + success);
-        return waitForDefaultRouteSet(ifname, gateway);
-      });
-  }
-
-  //---------------------------------------------------
-  // Public test suite functions
-  //---------------------------------------------------
-  suite.scanInterfaces = scanInterfaces;
-  suite.addInterface = addInterface;
-  suite.removeInterface = removeInterface;
-  suite.enableInterface = enableInterface;
-  suite.disableInterface = disableInterface;
-  suite.makeInterfaceConnect = makeInterfaceConnect;
-  suite.makeInterfaceDisconnect = makeInterfaceDisconnect;
-  suite.updateInterfaceConfig = updateInterfaceConfig;
-  suite.getDhcpIpAddr = getDhcpIpAddr;
-  suite.getDhcpGateway = getDhcpGateway;
-  suite.checkInterfaceExist = checkInterfaceExist;
-  suite.checkInterfaceIsEnabled = checkInterfaceIsEnabled;
-  suite.checkInterfaceIpAddr = checkInterfaceIpAddr;
-  suite.checkDefaultRoute = checkDefaultRoute;
-  suite.checkInterfaceListLength = checkInterfaceListLength;
-  suite.waitForTimeout = waitForTimeout;
-  suite.waitForDefaultRouteSet = waitForDefaultRouteSet;
-
-  /**
-   * End up the test run.
-   *
-   * Wait until all pending emulator shell commands are done and then |finish|
-   * will be called in the end.
-   */
-  function cleanUp() {
-    waitFor(finish, function() {
-      return pendingEmulatorShellCount === 0;
-    });
-  }
-
-  /**
-   * Common test routine.
-   *
-   * Start a test with the given test case chain. The test environment will be
-   * settled down before the test. After the test, all the affected things will
-   * be restored.
-   *
-   * @param aTestCaseChain
-   *        The test case entry point, which can be a function or a promise.
-   *
-   * @return A deferred promise.
-   */
-  suite.doTest = function(aTestCaseChain) {
-    return Promise.resolve()
-      .then(aTestCaseChain)
-      .then(function onresolve() {
-        cleanUp();
-      }, function onreject(aReason) {
-        ok(false, 'Promise rejects during test' + (aReason ? '(' + aReason + ')' : ''));
-        cleanUp();
-      });
-  };
-
-  return suite;
-})();
deleted file mode 100644
--- a/dom/network/tests/marionette/manifest.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[DEFAULT]
-run-if = buildapp == 'b2g'
-
-[test_ethernet_add_interface.js]
-[test_ethernet_remove_interface.js]
-[test_ethernet_enable.js]
-[test_ethernet_disable.js]
-[test_ethernet_connect_with_dhcp.js]
-[test_ethernet_connect_with_static_ip.js]
-[test_ethernet_reconnect_with_dhcp.js]
-[test_ethernet_reconnect_with_static_ip.js]
-[test_ethernet_ip_mode_change.js]
-[test_ethernet_disconnect.js]
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_add_interface.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.checkInterfaceListLength(0))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.checkInterfaceListLength(1))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME));
-});
\ No newline at end of file
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_connect_with_dhcp.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-
-function checkDhcpResult(ifname) {
-  return gTestSuite.getDhcpIpAddr(ifname)
-    .then(ip => gTestSuite.checkInterfaceIpAddr(ifname, ip))
-    .then(() => gTestSuite.getDhcpGateway(ifname))
-    .then(gateway => gTestSuite.waitForDefaultRouteSet(ifname, gateway));
-}
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.enableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceConnect(ETHERNET_INTERFACE_NAME))
-    .then(() => checkDhcpResult(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceDisconnect(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.disableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME));
-});
\ No newline at end of file
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_connect_with_static_ip.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-
-let staticConfig = {
-  ip: "1.2.3.4",
-  gateway: "1.2.3.5",
-  prefixLength: 24,
-  dnses: ["1.2.3.6"],
-  ipMode: "static"
-};
-
-function checkStaticResult(ifname) {
-  return gTestSuite.checkInterfaceIpAddr(ifname, staticConfig.ip)
-    .then(() => gTestSuite.checkDefaultRoute(ifname, staticConfig.gateway));
-}
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.enableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.updateInterfaceConfig(ETHERNET_INTERFACE_NAME, staticConfig))
-    .then(() => gTestSuite.makeInterfaceConnect(ETHERNET_INTERFACE_NAME))
-    .then(() => checkStaticResult(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceDisconnect(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.disableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME));
-});
\ No newline at end of file
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_disable.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.enableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.disableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.checkInterfaceIsEnabled(ETHERNET_INTERFACE_NAME, false))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME));
-});
\ No newline at end of file
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_disconnect.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-const INTERFACE_IP_NONE = "0.0.0.0";
-
-function checkIpAddrIsReset(ifname) {
-  return gTestSuite.checkInterfaceIpAddr(ifname, INTERFACE_IP_NONE)
-    .then(() => gTestSuite.checkDefaultRoute(ifname));
-}
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.enableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceConnect(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceDisconnect(ETHERNET_INTERFACE_NAME))
-    .then(() => checkIpAddrIsReset(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.disableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME));
-});
\ No newline at end of file
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_enable.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.enableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.checkInterfaceIsEnabled(ETHERNET_INTERFACE_NAME, true))
-    .then(() => gTestSuite.disableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME));
-});
\ No newline at end of file
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_ip_mode_change.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-
-let staticConfig = {
-  ip: "1.2.3.4",
-  gateway: "1.2.3.5",
-  prefixLength: 24,
-  dnses: ["1.2.3.6"],
-  ipMode: "static"
-};
-
-function checkStaticResult(ifname) {
-  return gTestSuite.checkInterfaceIpAddr(ifname, staticConfig.ip)
-    .then(() => gTestSuite.waitForDefaultRouteSet(ifname, staticConfig.gateway));
-}
-
-function checkDhcpResult(ifname) {
-  return gTestSuite.getDhcpIpAddr(ifname)
-    .then(ip => gTestSuite.checkInterfaceIpAddr(ifname, ip))
-    .then(() => gTestSuite.getDhcpGateway(ifname))
-    .then(gateway => gTestSuite.waitForDefaultRouteSet(ifname, gateway));
-}
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.enableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceConnect(ETHERNET_INTERFACE_NAME))
-    .then(() => checkDhcpResult(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.updateInterfaceConfig(ETHERNET_INTERFACE_NAME, staticConfig))
-    .then(() => checkStaticResult(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.updateInterfaceConfig(ETHERNET_INTERFACE_NAME, { ipMode: "dhcp"}))
-    .then(() => checkDhcpResult(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceDisconnect(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.disableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME));
-});
\ No newline at end of file
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_reconnect_with_dhcp.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-
-function checkDhcpResult(ifname) {
-  return gTestSuite.getDhcpIpAddr(ifname)
-    .then(ip => gTestSuite.checkInterfaceIpAddr(ifname, ip))
-    .then(() => gTestSuite.getDhcpGateway(ifname))
-    .then(gateway => gTestSuite.waitForDefaultRouteSet(ifname, gateway));
-}
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.enableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceConnect(ETHERNET_INTERFACE_NAME))
-    .then(() => checkDhcpResult(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceDisconnect(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceConnect(ETHERNET_INTERFACE_NAME))
-    .then(() => checkDhcpResult(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceDisconnect(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.disableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME));
-});
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_reconnect_with_static_ip.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-
-let staticConfig = {
-  ip: "1.2.3.4",
-  gateway: "1.2.3.5",
-  prefixLength: 24,
-  dnses: ["1.2.3.6"],
-  ipMode: "static"
-};
-
-function checkStaticResult(ifname) {
-  return gTestSuite.checkInterfaceIpAddr(ifname, staticConfig.ip)
-    .then(() => gTestSuite.checkDefaultRoute(ifname, staticConfig.gateway));
-}
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.enableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.updateInterfaceConfig(ETHERNET_INTERFACE_NAME, staticConfig))
-    .then(() => gTestSuite.makeInterfaceConnect(ETHERNET_INTERFACE_NAME))
-    .then(() => checkStaticResult(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceDisconnect(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceConnect(ETHERNET_INTERFACE_NAME))
-    .then(() => checkStaticResult(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.makeInterfaceDisconnect(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.disableInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME));
-});
\ No newline at end of file
deleted file mode 100644
--- a/dom/network/tests/marionette/test_ethernet_remove_interface.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-MARIONETTE_TIMEOUT = 60000;
-MARIONETTE_HEAD_JS = 'head.js';
-
-const ETHERNET_INTERFACE_NAME = "eth1";
-
-gTestSuite.doTest(function() {
-  return Promise.resolve()
-    .then(() => gTestSuite.checkInterfaceExist(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.addInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.checkInterfaceListLength(1))
-    .then(() => gTestSuite.removeInterface(ETHERNET_INTERFACE_NAME))
-    .then(() => gTestSuite.checkInterfaceListLength(0));
-});
\ No newline at end of file
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -133,17 +133,16 @@ ARCHIVE_FILES = {
                 'puppeteer/firefox/docs',
             ],
         },
         {
             'source': buildconfig.topsrcdir,
             'base': '',
             'manifests': [
                 'testing/marionette/harness/marionette_harness/tests/unit-tests.ini',
-                'testing/marionette/harness/marionette_harness/tests/webapi-tests.ini',
             ],
             # We also need the manifests and harness_unit tests
             'pattern': 'testing/marionette/harness/marionette_harness/tests/**',
             'dest': 'marionette/tests',
         },
         {
             'source': buildconfig.topobjdir,
             'base': '_tests',
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -1854,20 +1854,16 @@ VARIABLES = {
     'MARIONETTE_LAYOUT_MANIFESTS': (ManifestparserManifestList, list,
         """List of manifest files defining marionette-layout tests.
         """),
 
     'MARIONETTE_UNIT_MANIFESTS': (ManifestparserManifestList, list,
         """List of manifest files defining marionette-unit tests.
         """),
 
-    'MARIONETTE_WEBAPI_MANIFESTS': (ManifestparserManifestList, list,
-        """List of manifest files defining marionette-webapi tests.
-        """),
-
     'METRO_CHROME_MANIFESTS': (ManifestparserManifestList, list,
         """List of manifest files defining metro browser chrome tests.
         """),
 
     'MOCHITEST_CHROME_MANIFESTS': (ManifestparserManifestList, list,
         """List of manifest files defining mochitest chrome tests.
         """),
 
deleted file mode 100644
--- a/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[include:../../../../../dom/events/test/marionette/manifest.ini]
-skip-if = android_version > '15' # Bug 1203075
-[include:../../../../../dom/network/tests/marionette/manifest.ini]
--- a/testing/marionette/moz.build
+++ b/testing/marionette/moz.build
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ["components"]
 
 JAR_MANIFESTS += ["jar.mn"]
 JS_PREFERENCE_FILES += ["prefs/marionette.js"]
 
 MARIONETTE_UNIT_MANIFESTS += ["harness/marionette_harness/tests/unit/unit-tests.ini"]
-MARIONETTE_WEBAPI_MANIFESTS += ["harness/marionette_harness/tests/webapi-tests.ini"]
 XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
 
 with Files("**"):
     BUG_COMPONENT = ("Testing", "Marionette")
 
 with Files("harness/**"):
     SCHEDULES.exclusive = ["marionette", "firefox-ui"]