[Autotest][COIL] updates to client/tests/*

Replacing master --> main

BUG=b:169251128
TEST=None, test changes (that look out of date)

Change-Id: I2cc37b57ed8da8b0c9c3fd878e0456e59f1a96a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2601719
Tested-by: Derek Beckett <dbeckett@chromium.org>
Auto-Submit: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Greg Edelston <gredelston@google.com>
Commit-Queue: Greg Edelston <gredelston@google.com>
diff --git a/client/tests/barriertest/barriertest.py b/client/tests/barriertest/barriertest.py
index e3bd9e3..6b72f31 100644
--- a/client/tests/barriertest/barriertest.py
+++ b/client/tests/barriertest/barriertest.py
@@ -9,7 +9,7 @@
     version = 2
 
 
-    def run_once(self, our_addr, hostnames, master, timeout=120):
+    def run_once(self, our_addr, hostnames, main, timeout=120):
         # A reusable local server as we're using multiple barriers in one test.
         server = barrier.listen_server()
 
@@ -19,7 +19,7 @@
         logging.info('1. rendezvous "First" complete.')
         time.sleep(2)
 
-        # A rendezvous_servers using a different master than the default.
+        # A rendezvous_servers using a different main than the default.
         self.job.barrier(our_addr, 'Second', timeout=timeout,
                          listen_server=server
                          ).rendezvous_servers(hostnames[-1], *hostnames[:-1])
@@ -46,15 +46,15 @@
         # Now attempt a rendezvous_servers that also includes the server.
         self.job.barrier(our_addr, 'FinalSync', timeout=timeout,
                          listen_server=server
-                         ).rendezvous_servers(master, *hostnames)
+                         ).rendezvous_servers(main, *hostnames)
         logging.info('4. rendezvous_servers "FinalSync" complete.')
         time.sleep(2)
 
-        # rendezvous_servers, aborted from the master.
+        # rendezvous_servers, aborted from the main.
         try:
             self.job.barrier(our_addr, 'WillAbortServers', timeout=timeout,
                              listen_server=server
-                             ).rendezvous_servers(master, *hostnames)
+                             ).rendezvous_servers(main, *hostnames)
         except error.BarrierAbortError:
             pass
         except error.BarrierError, e:
diff --git a/client/tests/profiler_sync/profiler_sync.py b/client/tests/profiler_sync/profiler_sync.py
index 8f28eb0..ead0c4a 100644
--- a/client/tests/profiler_sync/profiler_sync.py
+++ b/client/tests/profiler_sync/profiler_sync.py
@@ -10,17 +10,17 @@
 
 
     def execute(self, timeout_sync, timeout_start, timeout_stop,
-                hostid, masterid, all_ids):
+                hostid, mainid, all_ids):
         """
         @param timeout_sync: Seconds to wait for the synchronization of all
                 hosts that will be launching profilers. (local_sync_profilers)
         @param timeout_start: Seconds to wait for each of the initial
                 sync_profilers and start_profilers barriers between this
-                host and the master to be reached.
-        @param timeout_stop: Seconds to wait for this host and the master to
+                host and the main to be reached.
+        @param timeout_stop: Seconds to wait for this host and the main to
                 reach each of the stop_profilers and finish_profilers barriers.
         @param hostid: This host's id (typically the hostname).
-        @param masterid: The master barrier host id where autoserv is running.
+        @param mainid: The main barrier host id where autoserv is running.
         @param all_ids: A list of all hosts to synchronize profilers on.
         """
         profilers = self.job.profilers
@@ -28,11 +28,11 @@
         barrier_server = barrier.listen_server(port=11920)
         b0 = self.job.barrier(hostid, "sync_profilers", timeout_start,
                               listen_server=barrier_server)
-        b0.rendezvous_servers(masterid, hostid)
+        b0.rendezvous_servers(mainid, hostid)
 
         b1 = self.job.barrier(hostid, "start_profilers", timeout_start,
                               listen_server=barrier_server)
-        b1.rendezvous_servers(masterid, hostid)
+        b1.rendezvous_servers(mainid, hostid)
 
         b2 = self.job.barrier(hostid, "local_sync_profilers", timeout_sync)
         b2.rendezvous(*all_ids)
@@ -41,13 +41,13 @@
 
         b3 = self.job.barrier(hostid, "stop_profilers", timeout_stop,
                               listen_server=barrier_server)
-        b3.rendezvous_servers(masterid, hostid)
+        b3.rendezvous_servers(mainid, hostid)
 
         profilers.stop(self)
         profilers.report(self)
 
         b4 = self.job.barrier(hostid, "finish_profilers", timeout_stop,
                               listen_server=barrier_server)
-        b4.rendezvous_servers(masterid, hostid)
+        b4.rendezvous_servers(mainid, hostid)
 
         barrier_server.close()