From b654bff281c058c0ac85c70bbfab706adbdd82b0 Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Sat, 29 Feb 2020 12:38:13 -0800 Subject: [PATCH] Move captures & PyHci/PyAclManager to common cert This way they can be used across tests. Test: cert/run --host Change-Id: I52c1ef1e9b24d2d143aa89a467a2eb535c8acb97 --- gd/{hci => }/cert/captures.py | 0 gd/{hci => }/cert/py_acl_manager.py | 6 +++--- gd/{hci => }/cert/py_hci.py | 6 +++--- gd/hci/cert/acl_manager_test.py | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) rename gd/{hci => }/cert/captures.py (100%) rename gd/{hci => }/cert/py_acl_manager.py (96%) rename gd/{hci => }/cert/py_hci.py (96%) diff --git a/gd/hci/cert/captures.py b/gd/cert/captures.py similarity index 100% rename from gd/hci/cert/captures.py rename to gd/cert/captures.py diff --git a/gd/hci/cert/py_acl_manager.py b/gd/cert/py_acl_manager.py similarity index 96% rename from gd/hci/cert/py_acl_manager.py rename to gd/cert/py_acl_manager.py index b7a4028d7..f61b76f7a 100644 --- a/gd/hci/cert/py_acl_manager.py +++ b/gd/cert/py_acl_manager.py @@ -18,9 +18,9 @@ from google.protobuf import empty_pb2 as empty_proto from cert.event_stream import EventStream from cert.event_stream import FilteringEventStream from cert.event_stream import IEventStream -from captures import ReadBdAddrCompleteCapture -from captures import ConnectionCompleteCapture -from captures import ConnectionRequestCapture +from cert.captures import ReadBdAddrCompleteCapture +from cert.captures import ConnectionCompleteCapture +from cert.captures import ConnectionRequestCapture from bluetooth_packets_python3 import hci_packets from cert.truth import assertThat from hci.facade import facade_pb2 as hci_facade diff --git a/gd/hci/cert/py_hci.py b/gd/cert/py_hci.py similarity index 96% rename from gd/hci/cert/py_hci.py rename to gd/cert/py_hci.py index 47b84a055..cb7c435f3 100644 --- a/gd/hci/cert/py_hci.py +++ b/gd/cert/py_hci.py @@ -18,9 +18,9 @@ from google.protobuf import empty_pb2 as empty_proto from cert.event_stream import EventStream from cert.event_stream import FilteringEventStream from cert.event_stream import IEventStream -from captures import ReadBdAddrCompleteCapture -from captures import ConnectionCompleteCapture -from captures import ConnectionRequestCapture +from cert.captures import ReadBdAddrCompleteCapture +from cert.captures import ConnectionCompleteCapture +from cert.captures import ConnectionRequestCapture from bluetooth_packets_python3 import hci_packets from cert.truth import assertThat from hci.facade import facade_pb2 as hci_facade diff --git a/gd/hci/cert/acl_manager_test.py b/gd/hci/cert/acl_manager_test.py index cc390fc9e..5e72baea2 100644 --- a/gd/hci/cert/acl_manager_test.py +++ b/gd/hci/cert/acl_manager_test.py @@ -28,11 +28,11 @@ from hci.facade import controller_facade_pb2 as controller_facade from hci.facade import facade_pb2 as hci_facade import bluetooth_packets_python3 as bt_packets from bluetooth_packets_python3 import hci_packets -from captures import ReadBdAddrCompleteCapture -from captures import ConnectionCompleteCapture -from captures import ConnectionRequestCapture -from py_hci import PyHci -from py_acl_manager import PyAclManager +from cert.captures import ReadBdAddrCompleteCapture +from cert.captures import ConnectionCompleteCapture +from cert.captures import ConnectionRequestCapture +from cert.py_hci import PyHci +from cert.py_acl_manager import PyAclManager class AclManagerTest(GdFacadeOnlyBaseTestClass): -- 2.11.0