Move out the initialization in bluetooth_AdapterAUHealth.run_onceupstream-main

https://crrev.com/c/4835815 introduced the force_offload flag but is
not initiated through quick_test_init. As the result it causes the AU
test batch failing on all HFP tests.

This patch move all initialization in bluetooth_AdapterAUHealth.run_once
to the preferred places: initialize_bluetooth_audio and quick_test_init.

BUG=b:295784542
TEST=bluetooth_AdapterAUHealth.all_floss
TEST=bluetooth_AdapterQuickHealth.AVL.all_floss
TEST=au_hfp_nbs_dut_as_sink_test.force_offload.floss skipped on Guybrush
TEST=au_hfp_wbs_dut_as_sink_test.force_offload.floss skipped on Guybrush

Change-Id: I6595482a9417cd3b47352317e9da76d34ec43c19
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/5521693
Auto-Submit: Hsin-chen Chuang <chharry@google.com>
Commit-Queue: John Lai <johnlai@google.com>
Tested-by: Hsin-chen Chuang <chharry@google.com>
Reviewed-by: John Lai <johnlai@google.com>

25 files changed, 34 insertions, 32 deletions

diff --git a/server/cros/bluetooth/bluetooth_adapter_audio_tests.py b/server/cros/bluetooth/bluetooth_adapter_audio_tests.py
index bf20cdf1c1..face1e9fe4 100644
--- a/server/cros/bluetooth/bluetooth_adapter_audio_tests.py
+++ b/server/cros/bluetooth/bluetooth_adapter_audio_tests.py
@@ -421,6 +421,7 @@ class BluetoothAdapterAudioTests(BluetoothAdapterTests):
                 to update the default one
 
         """
+        self.cleanup_audio_config()
         self.generate_audio_config(audio_config)
 
         audio_server = self.get_audio_server_name()
diff --git a/server/cros/bluetooth/bluetooth_adapter_quick_tests.py b/server/cros/bluetooth/bluetooth_adapter_quick_tests.py
index 1a4f92f5ec..1e9751aeb0 100644
--- a/server/cros/bluetooth/bluetooth_adapter_quick_tests.py
+++ b/server/cros/bluetooth/bluetooth_adapter_quick_tests.py
@@ -144,7 +144,8 @@ class BluetoothAdapterQuickTests(
                         llprivacy=False,
                         floss_lm_quirk=False,
                         enable_cellular=False,
-                        enable_ui=False):
+                        enable_ui=False,
+                        hfp_force_offload=False):
         """Inits the test batch
 
         @param floss_lm_quirk True to enable the quirk for b/260539322 to
@@ -164,6 +165,7 @@ class BluetoothAdapterQuickTests(
         self.args_dict = args_dict if args_dict else {}
         self._dr_utils = None
         self._ec = None
+        self.hfp_force_offload = hfp_force_offload
 
         logging.debug('args_dict %s', args_dict)
         self.rssi_check = self._get_bool_arg('rssi_check', args_dict, True)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/bluetooth_AdapterAUHealth.py b/server/site_tests/bluetooth_AdapterAUHealth/bluetooth_AdapterAUHealth.py
index 4651a9941c..c23c8eada3 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/bluetooth_AdapterAUHealth.py
+++ b/server/site_tests/bluetooth_AdapterAUHealth/bluetooth_AdapterAUHealth.py
@@ -230,8 +230,9 @@ class bluetooth_AdapterAUHealth(BluetoothAdapterQuickTests,
         @param test_profile: which test profile is used, HFP_SWB, HFP_WBS, or HFP_NBS
         @param audio_config: the test specific audio config
         """
-        apply_offload = self.will_apply_hfp_offload_path(self.force_offload)
-        if self.force_offload and not apply_offload:
+        apply_offload = self.will_apply_hfp_offload_path(
+                self.hfp_force_offload)
+        if self.hfp_force_offload and not apply_offload:
             raise error.TestNAError(
                     'The DUT does not support offload path. Skip the test.')
 
@@ -277,7 +278,7 @@ class bluetooth_AdapterAUHealth(BluetoothAdapterQuickTests,
             # the DUT should always choose the best codec reported by the peer
             self.test_set_force_hfp_swb_enabled(True)
 
-        if self.force_offload:
+        if self.hfp_force_offload:
             self.set_force_hfp_offload_on_support(True)
 
         try:
@@ -288,7 +289,7 @@ class bluetooth_AdapterAUHealth(BluetoothAdapterQuickTests,
         finally:
             # unset flags for testing purposes by finally clause to ensure they
             # will be executed under all circumstances.
-            if self.force_offload:
+            if self.hfp_force_offload:
                 self.set_force_hfp_offload_on_support(False)
 
             # remove this flag toggle once it is enabled by default (b/308859926)
@@ -653,16 +654,13 @@ class bluetooth_AdapterAUHealth(BluetoothAdapterQuickTests,
                  floss=False,
                  enable_cellular=False,
                  enable_ui=False,
-                 force_offload=False):
+                 hfp_force_offload=False):
         """Run the batch of Bluetooth stand health tests
 
         @param host: the DUT, usually a chromebook
         @param num_iterations: the number of rounds to execute the test
         @param test_name: the test to run, or None for all tests
         """
-        self.host = host
-        self.cleanup_audio_config()
-        self.force_offload = force_offload
 
         self.quick_test_init(host,
                              use_btpeer=True,
@@ -670,6 +668,7 @@ class bluetooth_AdapterAUHealth(BluetoothAdapterQuickTests,
                              args_dict=args_dict,
                              floss=floss,
                              enable_cellular=enable_cellular,
-                             enable_ui=enable_ui)
+                             enable_ui=enable_ui,
+                             hfp_force_offload=hfp_force_offload)
         self.au_health_batch_run(num_iterations, test_name)
         self.quick_test_cleanup()
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_test.force_offload
index 598d60611a..f139de228c 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_test.force_offload
@@ -44,6 +44,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_test.force_offload.floss
index adfb55644b..bb7fff6442 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_test.force_offload.floss
@@ -43,6 +43,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_visqol_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_visqol_test.force_offload
index b8e7132fd8..db9c192187 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_visqol_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_visqol_test.force_offload
@@ -45,6 +45,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_visqol_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_visqol_test.force_offload.floss
index 21d2a514eb..a09649886d 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_visqol_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_visqol_test.force_offload.floss
@@ -43,6 +43,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_with_super_resolution_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_with_super_resolution_test.force_offload
index a216f3a770..7fd4eda84d 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_with_super_resolution_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_with_super_resolution_test.force_offload
@@ -45,6 +45,6 @@ def run(machine):
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  tag='.'.join(NAME.split('.')[1:]),
                  args_dict=args_dict, test_name=NAME.split('.')[1],
-                 enable_cellular=True, enable_ui=True, force_offload=True)
+                 enable_cellular=True, enable_ui=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_with_super_resolution_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_with_super_resolution_test.force_offload.floss
index ed05630435..cd90343e52 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_with_super_resolution_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_sink_with_super_resolution_test.force_offload.floss
@@ -44,6 +44,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-                 floss=True, enable_cellular=True, enable_ui=True, force_offload=True)
+                 floss=True, enable_cellular=True, enable_ui=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_back2back_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_back2back_test.force_offload
index 5e5dc5a7cd..f323de6ff4 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_back2back_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_back2back_test.force_offload
@@ -40,6 +40,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_back2back_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_back2back_test.force_offload.floss
index 38afa18258..a005529147 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_back2back_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_back2back_test.force_offload.floss
@@ -39,6 +39,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_test.force_offload
index 208677280c..b0dcf9bfcd 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_test.force_offload
@@ -44,6 +44,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_test.force_offload.floss
index 39d3d5f5f3..bd10ff24a3 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_test.force_offload.floss
@@ -43,6 +43,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_visqol_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_visqol_test.force_offload
index 4af7ddc5b9..2ab59eb374 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_visqol_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_visqol_test.force_offload
@@ -45,6 +45,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_visqol_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_visqol_test.force_offload.floss
index f0a4f0927c..89554976a2 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_visqol_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_nbs_dut_as_source_visqol_test.force_offload.floss
@@ -43,6 +43,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_test.force_offload
index 1efae9aa31..551a636a59 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_test.force_offload
@@ -45,6 +45,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_test.force_offload.floss
index d035fe4b79..4702f6a718 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_test.force_offload.floss
@@ -44,6 +44,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_visqol_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_visqol_test.force_offload
index ca4e0903a8..42c49dfc90 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_visqol_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_visqol_test.force_offload
@@ -47,6 +47,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_visqol_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_visqol_test.force_offload.floss
index 236c028ebb..2395e3758e 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_visqol_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_sink_visqol_test.force_offload.floss
@@ -45,6 +45,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_back2back_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_back2back_test.force_offload
index c06cc4a64c..63248f8576 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_back2back_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_back2back_test.force_offload
@@ -41,6 +41,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_back2back_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_back2back_test.force_offload.floss
index babedbb781..34a184e70e 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_back2back_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_back2back_test.force_offload.floss
@@ -40,6 +40,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_test.force_offload
index de2a227b0f..ac4a32ecb1 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_test.force_offload
@@ -45,6 +45,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_test.force_offload.floss
index 838fd3b601..53485dd29e 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_test.force_offload.floss
@@ -44,6 +44,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_visqol_test.force_offload b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_visqol_test.force_offload
index e22eae0cbd..6904ff6637 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_visqol_test.force_offload
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_visqol_test.force_offload
@@ -46,6 +46,6 @@ def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
                  args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]),
-		 force_offload=True)
+                 hfp_force_offload=True)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_visqol_test.force_offload.floss b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_visqol_test.force_offload.floss
index 2dbf7f2b67..95e50a8854 100644
--- a/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_visqol_test.force_offload.floss
+++ b/server/site_tests/bluetooth_AdapterAUHealth/control.au_hfp_wbs_dut_as_source_visqol_test.force_offload.floss
@@ -44,6 +44,6 @@ args_dict = utils.args_to_dict(args)
 def run(machine):
     host = hosts.create_host(machine)
     job.run_test('bluetooth_AdapterAUHealth', host=host, num_iterations=1,
-                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, force_offload=True)
+                 args_dict=args_dict, test_name=NAME.split('.')[1], tag='.'.join(NAME.split('.')[1:]), floss=True, hfp_force_offload=True)
 
 parallel_simple(run, machines)