Bug 1647501 - Rename "test slave" -> "test machine", r=Gijs
authorSarah Bird <birdsarah@mozilla.com>
Thu, 02 Jul 2020 01:06:01 +0000
changeset 538364 8a9e63398ef9fdb6720599c67d38a160cac797d8
parent 538363 8881ac68a975fbd1560aeca746f60b7e6503157d
child 538365 8fbd31f301c71bf9e8fe30e97046dbe447028f8f
push id120533
push userrmaries@mozilla.com
push dateThu, 02 Jul 2020 01:19:36 +0000
treeherderautoland@8a9e63398ef9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1647501
milestone80.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 1647501 - Rename "test slave" -> "test machine", r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D81908
browser/base/content/test/performance/browser_startup_content_mainthreadio.js
browser/base/content/test/performance/browser_startup_mainthreadio.js
browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js
browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js
browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_targetSwitch.js
browser/components/extensions/test/browser/browser_ext_devtools_network_targetSwitch.js
browser/components/extensions/test/browser/browser_ext_devtools_panel.js
browser/installer/windows/nsis/maintenanceservice_installer.nsi
devtools/client/debugger/test/mochitest/browser_dbg-chrome-create.js
devtools/client/framework/browser-toolbox/test/browser_browser_toolbox.js
devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_contentframe_inspector.js
devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_inspector.js
devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_rtl.js
testing/mochitest/runtests.py
testing/mozbase/mozrunner/mozrunner/utils.py
testing/mozharness/mozharness/mozilla/testing/raptor.py
testing/mozharness/mozharness/mozilla/testing/talos.py
testing/mozharness/scripts/awsy_script.py
testing/xpcshell/runxpcshelltests.py
toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
toolkit/mozapps/update/common/registrycertificates.cpp
toolkit/mozapps/update/updater/updater.cpp
--- a/browser/base/content/test/performance/browser_startup_content_mainthreadio.js
+++ b/browser/base/content/test/performance/browser_startup_content_mainthreadio.js
@@ -323,17 +323,17 @@ add_task(async function() {
     let markers = getIOMarkersFromProfile(profile);
     for (let marker of markers) {
       if (marker.operation == "create/open") {
         // TODO: handle these I/O markers once they are supported on
         // non-Windows platforms.
         continue;
       }
 
-      // Convert to lower case before comparing because the OS X test slaves
+      // Convert to lower case before comparing because the OS X test machines
       // have the 'Firefox' folder in 'Library/Application Support' created
       // as 'firefox' for some reason.
       let filename = marker.filename.toLowerCase();
 
       if (!filename) {
         // We are still missing the filename on some mainthreadio markers,
         // these markers are currently useless for the purpose of this test.
         continue;
--- a/browser/base/content/test/performance/browser_startup_mainthreadio.js
+++ b/browser/base/content/test/performance/browser_startup_mainthreadio.js
@@ -768,17 +768,17 @@ add_task(async function() {
     let markers = phases[phase];
     for (let marker of markers) {
       if (marker.operation == "create/open") {
         // TODO: handle these I/O markers once they are supported on
         // non-Windows platforms.
         continue;
       }
 
-      // Convert to lower case before comparing because the OS X test slaves
+      // Convert to lower case before comparing because the OS X test machines
       // have the 'Firefox' folder in 'Library/Application Support' created
       // as 'firefox' for some reason.
       let filename = marker.filename.toLowerCase();
 
       if (!filename) {
         // We are still missing the filename on some mainthreadio markers,
         // these markers are currently useless for the purpose of this test.
         continue;
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js
@@ -339,17 +339,17 @@ var gTests = [
 
         // Select the first window again so that we can have a stream.
         menulist.getItemAtIndex(scaryWindowIndex).doCommand();
       }
 
       let sharingNonScaryWindow = typeof nonScaryWindowIndex == "number";
 
       // If we have a non-scary window, select it and verify the warning isn't displayed.
-      // A non-scary window may not always exist on test slaves.
+      // A non-scary window may not always exist on test machines.
       if (sharingNonScaryWindow) {
         menulist.getItemAtIndex(nonScaryWindowIndex).doCommand();
         ok(
           document.getElementById("webRTC-all-windows-shared").hidden,
           "the 'all windows will be shared' warning should still be hidden"
         );
         await TestUtils.waitForCondition(
           () => !document.getElementById("webRTC-preview").hidden,
@@ -361,17 +361,17 @@ var gTests = [
           !document.getElementById("webRTC-preview").hidden,
           "the preview area is visible"
         );
         ok(
           document.getElementById("webRTC-previewWarning").hidden,
           "the scary warning is hidden"
         );
       } else {
-        info("no non-scary window available on this test slave");
+        info("no non-scary window available on this test machine");
       }
 
       let indicator = promiseIndicatorWindow();
       let observerPromise1 = expectObserverCalled(
         "getUserMedia:response:allow"
       );
       let observerPromise2 = expectObserverCalled("recording-device-events");
       await promiseMessage("ok", () => {
--- a/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js
+++ b/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_reload.js
@@ -1,14 +1,14 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
 // Like most of the mochitest-browser devtools test,
-// on debug test slave, it takes about 50s to run the test.
+// on debug test machine, it takes about 50s to run the test.
 requestLongerTimeout(4);
 
 loadTestSubscript("head_devtools.js");
 
 // Small helper which provides the common steps to the following reload test cases.
 async function runReloadTestCase({
   urlParams,
   background,
--- a/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_targetSwitch.js
+++ b/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_targetSwitch.js
@@ -1,14 +1,14 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
 // Like most of the mochitest-browser devtools test,
-// on debug test slave, it takes about 50s to run the test.
+// on debug test machine, it takes about 50s to run the test.
 requestLongerTimeout(4);
 
 loadTestSubscript("head_devtools.js");
 
 const MAIN_PROCESS_PAGE = "about:robots";
 const CONTENT_PROCESS_PAGE =
   "data:text/html,<title>content process page</title>";
 const CONTENT_PROCESS_PAGE2 = "http://example.com/";
--- a/browser/components/extensions/test/browser/browser_ext_devtools_network_targetSwitch.js
+++ b/browser/components/extensions/test/browser/browser_ext_devtools_network_targetSwitch.js
@@ -1,14 +1,14 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
 // Like most of the mochitest-browser devtools test,
-// on debug test slave, it takes about 50s to run the test.
+// on debug test machine, it takes about 50s to run the test.
 requestLongerTimeout(4);
 
 loadTestSubscript("head_devtools.js");
 
 const MAIN_PROCESS_PAGE = "about:robots";
 const CONTENT_PROCESS_PAGE = "http://example.com/";
 
 async function testOnNavigatedEvent(uri, tab, toolbox, extension) {
--- a/browser/components/extensions/test/browser/browser_ext_devtools_panel.js
+++ b/browser/components/extensions/test/browser/browser_ext_devtools_panel.js
@@ -1,14 +1,14 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
 // Like most of the mochitest-browser devtools test,
-// on debug test slave, it takes about 50s to run the test.
+// on debug test machine, it takes about 50s to run the test.
 requestLongerTimeout(4);
 
 loadTestSubscript("head_devtools.js");
 
 ChromeUtils.defineModuleGetter(
   this,
   "Preferences",
   "resource://gre/modules/Preferences.jsm"
--- a/browser/installer/windows/nsis/maintenanceservice_installer.nsi
+++ b/browser/installer/windows/nsis/maintenanceservice_installer.nsi
@@ -32,17 +32,17 @@ Var BrandFullName
 !include WinMessages.nsh
 !include WinVer.nsh
 !include WordFunc.nsh
 
 !insertmacro GetOptions
 !insertmacro GetParameters
 !insertmacro GetSize
 
-; The test slaves use this fallback key to run tests.
+; The test machines use this fallback key to run tests.
 ; And anyone that wants to run tests themselves should already have 
 ; this installed.
 !define FallbackKey \
   "SOFTWARE\Mozilla\MaintenanceService\3932ecacee736d366d6436db0f55bce4"
 
 !define CompanyName "Mozilla Corporation"
 !define BrandFullNameInternal ""
 
--- a/devtools/client/debugger/test/mochitest/browser_dbg-chrome-create.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg-chrome-create.js
@@ -13,17 +13,17 @@ PromiseTestUtils.whitelistRejectionsGlob
 PromiseTestUtils.whitelistRejectionsGlobally(/NS_ERROR_FAILURE/);
 
 requestLongerTimeout(5);
 
 const { BrowserToolboxLauncher } = ChromeUtils.import("resource://devtools/client/framework/browser-toolbox/Launcher.jsm");
 let gProcess = undefined;
 
 add_task(async function() {
-  // Windows XP and 8.1 test slaves are terribly slow at this test.
+  // Windows XP and 8.1 test machines are terribly slow at this test.
   await pushPref("devtools.chrome.enabled", true);
   await pushPref("devtools.debugger.remote-enabled", true);
 
   gProcess = await initChromeDebugger();
 
   ok(
     gProcess._dbgProcess,
     "The remote debugger process wasn't created properly!"
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox.js
@@ -3,17 +3,17 @@
 
 // There are shutdown issues for which multiple rejections are left uncaught.
 // See bug 1018184 for resolving these issues.
 const { PromiseTestUtils } = ChromeUtils.import(
   "resource://testing-common/PromiseTestUtils.jsm"
 );
 PromiseTestUtils.whitelistRejectionsGlobally(/File closed/);
 
-// On debug test slave, it takes about 50s to run the test.
+// On debug test machine, it takes about 50s to run the test.
 requestLongerTimeout(4);
 
 add_task(async function() {
   const ToolboxTask = await initBrowserToolboxTask();
   await ToolboxTask.importFunctions({});
 
   const hasCloseButton = await ToolboxTask.spawn(null, async () => {
     /* global gToolbox */
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_contentframe_inspector.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_contentframe_inspector.js
@@ -9,17 +9,17 @@ const { PromiseTestUtils } = ChromeUtils
 PromiseTestUtils.whitelistRejectionsGlobally(/File closed/);
 
 /* import-globals-from ../../../inspector/test/shared-head.js */
 Services.scriptloader.loadSubScript(
   "chrome://mochitests/content/browser/devtools/client/inspector/test/shared-head.js",
   this
 );
 
-// On debug test slave, it takes about 50s to run the test.
+// On debug test machine, it takes about 50s to run the test.
 requestLongerTimeout(4);
 
 /**
  * Check that different-site iframes can be expanded in the Omniscient Browser
  * Toolbox. The test is supposed to run successfully with or without fission.
  * Pass --enable-fission to ./mach test to enable fission when running this
  * test locally.
  */
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_inspector.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_fission_inspector.js
@@ -3,17 +3,17 @@
 
 // There are shutdown issues for which multiple rejections are left uncaught.
 // See bug 1018184 for resolving these issues.
 const { PromiseTestUtils } = ChromeUtils.import(
   "resource://testing-common/PromiseTestUtils.jsm"
 );
 PromiseTestUtils.whitelistRejectionsGlobally(/File closed/);
 
-// On debug test slave, it takes about 50s to run the test.
+// On debug test machine, it takes about 50s to run the test.
 requestLongerTimeout(4);
 
 // This test is used to test fission-like features via the Browser Toolbox:
 // - computed view is correct when selecting an element in a remote frame
 
 add_task(async function() {
   // Forces the Browser Toolbox to open on the inspector by default
   await pushPref("devtools.browsertoolbox.panel", "inspector");
--- a/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_rtl.js
+++ b/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_rtl.js
@@ -3,17 +3,17 @@
 
 // There are shutdown issues for which multiple rejections are left uncaught.
 // See bug 1018184 for resolving these issues.
 const { PromiseTestUtils } = ChromeUtils.import(
   "resource://testing-common/PromiseTestUtils.jsm"
 );
 PromiseTestUtils.whitelistRejectionsGlobally(/File closed/);
 
-// On debug test slave, it takes about 50s to run the test.
+// On debug test machine, it takes about 50s to run the test.
 requestLongerTimeout(4);
 
 // Test that DevTools panels are rendered in "rtl" (right-to-left) in the Browser Toolbox.
 add_task(async function() {
   await pushPref("intl.uidirection", 1);
 
   const ToolboxTask = await initBrowserToolboxTask();
   await ToolboxTask.importFunctions({});
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -487,17 +487,17 @@ class MochitestServer(object):
         env["XPCOM_DEBUG_BREAK"] = "warn"
         if "LD_LIBRARY_PATH" not in env or env["LD_LIBRARY_PATH"] is None:
             env["LD_LIBRARY_PATH"] = self._xrePath
         else:
             env["LD_LIBRARY_PATH"] = ":".join([self._xrePath, env["LD_LIBRARY_PATH"]])
 
         # When running with an ASan build, our xpcshell server will also be ASan-enabled,
         # thus consuming too much resources when running together with the browser on
-        # the test slaves. Try to limit the amount of resources by disabling certain
+        # the test machines. Try to limit the amount of resources by disabling certain
         # features.
         env["ASAN_OPTIONS"] = "quarantine_size=1:redzone=32:malloc_context_size=5"
 
         # Likewise, when running with a TSan build, our xpcshell server will
         # also be TSan-enabled. Except that in this case, we don't really
         # care about races in xpcshell. So disable TSan for the server.
         env["TSAN_OPTIONS"] = "report_bugs=0"
 
--- a/testing/mozbase/mozrunner/mozrunner/utils.py
+++ b/testing/mozbase/mozrunner/mozrunner/utils.py
@@ -170,17 +170,17 @@ def test_environment(xrePath, env=None, 
                     os.popen("wmic computersystem get TotalPhysicalMemory").readlines()[1]) / 1024
             elif mozinfo.isMac:
                 totalMemory = int(os.popen("sysctl hw.memsize").readlines()[0].split()[1]) / 1024
             else:
                 totalMemory = int(os.popen("free").readlines()[1].split()[1])
 
             # Only 4 GB RAM or less available? Use custom ASan options to reduce
             # the amount of resources required to do the tests. Standard options
-            # will otherwise lead to OOM conditions on the current test slaves.
+            # will otherwise lead to OOM conditions on the current test machines.
             message = "INFO | runtests.py | ASan running in %s configuration"
             asanOptions = []
             if totalMemory <= 1024 * 1024 * 4:
                 message = message % 'low-memory'
                 asanOptions = [
                     'quarantine_size=50331648', 'malloc_context_size=5']
             else:
                 message = message % 'default memory'
--- a/testing/mozharness/mozharness/mozilla/testing/raptor.py
+++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py
@@ -650,17 +650,17 @@ class Raptor(TestingMixin, MercurialScri
                     options.extend([arg])
 
         for key, value in kw_options.items():
             options.extend(['--%s' % key, value])
 
         return options
 
     def populate_webroot(self):
-        """Populate the production test slaves' webroots"""
+        """Populate the production test machines' webroots"""
         self.raptor_path = os.path.join(
             self.query_abs_dirs()['abs_test_install_dir'], 'raptor'
         )
         if self.config.get('run_local'):
             self.raptor_path = os.path.join(self.repo_path, 'testing', 'raptor')
 
     def clobber(self):
         # Recreate the upload directory for storing the logcat collected
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -413,17 +413,17 @@ class Talos(TestingMixin, MercurialScrip
         # enabling fission can come from the --enable-fission cmd line argument; or in CI
         # it comes from a taskcluster transform which adds a --setpref for fission.autostart
         if self.config['enable_fission'] or "fission.autostart=true" in self.config['extra_prefs']:
             options.extend(['--enable-fission'])
 
         return options
 
     def populate_webroot(self):
-        """Populate the production test slaves' webroots"""
+        """Populate the production test machines' webroots"""
         self.talos_path = os.path.join(
             self.query_abs_dirs()['abs_test_install_dir'], 'talos'
         )
 
         # need to determine if talos pageset is required to be downloaded
         if self.config.get('run_local') and 'talos_extra_options' in self.config:
             # talos initiated locally, get and verify test/suite from cmd line
             self.talos_path = os.path.dirname(self.talos_json)
--- a/testing/mozharness/scripts/awsy_script.py
+++ b/testing/mozharness/scripts/awsy_script.py
@@ -136,17 +136,17 @@ class AWSY(TestingMixin, MercurialScript
 
         for requirements_file in requirements_files:
             self.register_virtualenv_module(requirements=[requirements_file],
                                             two_pass=True)
 
         self.register_virtualenv_module('awsy', self.awsy_path)
 
     def populate_webroot(self):
-        """Populate the production test slaves' webroots"""
+        """Populate the production test machines' webroots"""
         self.info("Downloading pageset with tooltool...")
         manifest_file = os.path.join(self.awsy_path, 'tp5n-pageset.manifest')
         page_load_test_dir = os.path.join(self.webroot_dir, 'page_load_test')
         if not os.path.isdir(page_load_test_dir):
             self.mkdir_p(page_load_test_dir)
         self.tooltool_fetch(
             manifest_file,
             output_dir=page_load_test_dir,
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -1792,17 +1792,17 @@ class XPCShellTests(object):
                 break
             keep_going = test.keep_going
 
         # restore default SIGINT behaviour
         signal.signal(signal.SIGINT, signal.SIG_DFL)
 
         # Clean up any slacker directories that might be lying around
         # Some might fail because of windows taking too long to unlock them.
-        # We don't do anything if this fails because the test slaves will have
+        # We don't do anything if this fails because the test machines will have
         # their $TEMP dirs cleaned up on reboot anyway.
         for directory in self.cleanup_dir_list:
             try:
                 shutil.rmtree(directory)
             except Exception:
                 self.log.info("%s could not be cleaned up." % directory)
 
         if exceptions:
--- a/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
+++ b/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
@@ -32,17 +32,17 @@ Var BrandFullName
 !include WinMessages.nsh
 !include WinVer.nsh
 !include WordFunc.nsh
 
 !insertmacro GetOptions
 !insertmacro GetParameters
 !insertmacro GetSize
 
-; The test slaves use this fallback key to run tests.
+; The test machines use this fallback key to run tests.
 ; And anyone that wants to run tests themselves should already have 
 ; this installed.
 !define FallbackKey \
   "SOFTWARE\Mozilla\MaintenanceService\3932ecacee736d366d6436db0f55bce4"
 
 !define CompanyName "Mozilla Corporation"
 !define BrandFullNameInternal ""
 
--- a/toolkit/mozapps/update/common/registrycertificates.cpp
+++ b/toolkit/mozapps/update/common/registrycertificates.cpp
@@ -40,17 +40,17 @@ BOOL DoesBinaryMatchAllowedCertificates(
   // force the non redirected registry under Wow6432Node.
   // This flag is ignored on 32bit systems.
   HKEY baseKey;
   LONG retCode = RegOpenKeyExW(HKEY_LOCAL_MACHINE, maintenanceServiceKey, 0,
                                KEY_READ | KEY_WOW64_64KEY, &baseKey);
   if (retCode != ERROR_SUCCESS) {
     LOG_WARN(("Could not open key.  (%d)", retCode));
     // Our tests run with a different apply directory for each test.
-    // We use this registry key on our test slaves to store the
+    // We use this registry key on our test machines to store the
     // allowed name/issuers.
     retCode = RegOpenKeyExW(HKEY_LOCAL_MACHINE, TEST_ONLY_FALLBACK_KEY_PATH, 0,
                             KEY_READ | KEY_WOW64_64KEY, &baseKey);
     if (retCode != ERROR_SUCCESS) {
       LOG_WARN(("Could not open fallback key.  (%d)", retCode));
       return FALSE;
     } else if (allowFallbackKeySkip) {
       LOG_WARN(
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -2838,17 +2838,17 @@ int NS_main(int argc, NS_tchar** argv) {
   // We never want the service to be used unless we build with
   // the maintenance service.
 #  ifdef MOZ_MAINTENANCE_SERVICE
   useService = IsUpdateStatusPendingService();
 #    ifdef TEST_UPDATER
   noServiceFallback = EnvHasValue("MOZ_NO_SERVICE_FALLBACK");
   putenv(const_cast<char*>("MOZ_NO_SERVICE_FALLBACK="));
   // Our tests run with a different apply directory for each test.
-  // We use this registry key on our test slaves to store the
+  // We use this registry key on our test machines to store the
   // allowed name/issuers.
   testOnlyFallbackKeyExists = DoesFallbackKeyExist();
 #    endif
 #  endif
 
   // Remove everything except close window from the context menu
   {
     HKEY hkApp = nullptr;