commit 433045b59d1be77e5bb04f555c0ae1a1b8bbbc73
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 27 22:53:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 27 22:53:41 2019 +0000
tree 5165ddfb17a4b934569a2f61e4589bd5f7852f75
parent c8a85a09e2347f223024019005ebe0cb1bf74e2e
parent 905d5c2267d6abcb3fb379883ccaa13a16bfb85f

Merge "HCI: Change CreateAdvertiser overload to ExtendedCreateAdvertiser"

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(
                 [