commit e8815f9c74028ff073cae8ba65f5856cad3f1524
author Myles Watson <mylesgw@google.com> Wed Nov 27 14:06:29 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 27 14:06:29 2019 -0800
tree 6215dc54b575b851cf5cea9645900b651e867dfd
parent 1f07e6a015b94cc4a606e5e94a71c5bc88e76b00
parent 29fe81f374d96bd5e1ebfc76a26cb94fce05c327

Merge "cert: Use the Mobly TestRunConfig"
am: 29fe81f374

Change-Id: I97d0c9aa0d689a515d9b2997c1ec85899b9ac511

gd/cert/gd_base_test.py

diff --git a/gd/cert/gd_base_test.py b/gd/cert/gd_base_test.py
index 45c2077..72275fd 100644
--- a/gd/cert/gd_base_test.py
+++ b/gd/cert/gd_base_test.py
@@ -34,16 +34,16 @@
     def __init__(self, configs):
         BaseTestClass.__init__(self, configs)
 
-        log_path_base = configs.get('log_path', '/tmp/logs')
-        rootcanal_logpath = os.path.join(log_path_base, 'rootcanal_logs.txt')
-        self.rootcanal_logs = open(rootcanal_logpath, 'w')
-        gd_devices = self.testbed_configs.get("GdDevice")
-        gd_cert_devices = self.testbed_configs.get("GdCertDevice")
+        log_path_base = configs.log_path
+        gd_devices = self.controller_configs.get("GdDevice")
+        gd_cert_devices = self.controller_configs.get("GdCertDevice")
 
         self.rootcanal_running = False
-        if 'rootcanal' in configs["testbed_configs"]:
+        if 'rootcanal' in self.controller_configs:
             self.rootcanal_running = True
-            rootcanal_config = configs["testbed_configs"]['rootcanal']
+            rootcanal_logpath = os.path.join(log_path_base, 'rootcanal_logs.txt')
+            self.rootcanal_logs = open(rootcanal_logpath, 'w')
+            rootcanal_config = self.controller_configs['rootcanal']
             rootcanal_hci_port = str(rootcanal_config.get("hci_port", "6402"))
             self.rootcanal_process = subprocess.Popen(
                 [