Cert: Let EventStream subscribe() block am: f4736f27c1 am: 9742479ef2 am: 4b8c770dba (9298bc39) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/cert/event_stream.py

+29 −33

Original line number	Diff line number	Diff line
		@@ -24,38 +24,45 @@ from grpc import StatusCode

		class EventStream(object):

		event_buffer = []

		def __init__(self, stream_stub_fn):
		self.stream_stub_fn = stream_stub_fn
		self.event_buffer = []

		def clear_event_buffer(self):
		self.event_buffer.clear()

		def subscribe(self):
		return self.stream_stub_fn(
		common_pb2.EventStreamRequest(
		self.subscribe_request = common_pb2.EventStreamRequest(
		subscription_mode=common_pb2.SUBSCRIBE,
		fetch_mode=common_pb2.NONE
		)
		)

		def unsubscribe(self):
		return self.stream_stub_fn(
		common_pb2.EventStreamRequest(
		self.unsubscribe_request = common_pb2.EventStreamRequest(
		subscription_mode=common_pb2.UNSUBSCRIBE,
		fetch_mode=common_pb2.NONE
		)
		)

		def assert_none(self):
		response = self.stream_stub_fn(
		common_pb2.EventStreamRequest(
		subscription_mode=common_pb2.NONE,
		self.fetch_all_current_request = common_pb2.EventStreamRequest(
		subscription_mode=common_pb2.UNCHANGED,
		fetch_mode=common_pb2.ALL_CURRENT
		)

		self.fetch_at_least_one_request = lambda expiration_time : common_pb2.EventStreamRequest(
		subscription_mode=common_pb2.UNCHANGED,
		fetch_mode=common_pb2.AT_LEAST_ONE,
		timeout_ms = int((expiration_time - datetime.now()).total_seconds() * 1000)
		)

		def clear_event_buffer(self):
		self.event_buffer.clear()

		def subscribe(self):
		rpc = self.stream_stub_fn(self.subscribe_request)
		return rpc.result()

		def unsubscribe(self):
		rpc = self.stream_stub_fn(self.unsubscribe_request)
		return rpc.result()

		def assert_none(self):
		response = self.stream_stub_fn(self.fetch_all_current_request)

		try:
		for event in response:
		self.event_buffer.append(event)
		@@ -66,12 +73,7 @@ class EventStream(object):
		asserts.fail("event_buffer is not empty \n%s" % self.event_buffer)

		def assert_none_matching(self, match_fn):
		response = self.stream_stub_fn(
		common_pb2.EventStreamRequest(
		subscription_mode=common_pb2.NONE,
		fetch_mode=common_pb2.ALL_CURRENT
		)
		)
		response = self.stream_stub_fn(self.fetch_all_current_request)

		try:
		for event in response:
		@@ -95,13 +97,7 @@ class EventStream(object):
		if datetime.now() > expiration_time:
		asserts.fail("timeout of %s exceeded" % str(timeout))

		response = self.stream_stub_fn(
		common_pb2.EventStreamRequest(
		subscription_mode=common_pb2.NONE,
		fetch_mode=common_pb2.AT_LEAST_ONE,
		timeout_ms = int((expiration_time - datetime.now()).total_seconds() * 1000)
		)
		)
		response = self.stream_stub_fn(self.fetch_at_least_one_request(expiration_time))

		try:
		for event in response:

system/gd/hal/cert/simple_hal_test.py

+12 −10

Original line number	Diff line number	Diff line
		@@ -52,6 +52,8 @@ class SimpleHalTest(GdBaseTestClass):
		self.device_under_test.hal.SendHciResetCommand(empty_pb2.Empty())
		self.cert_device.hal.SendHciResetCommand(empty_pb2.Empty())

		self.hci_event_stream = self.device_under_test.hal.hci_event_stream

		def teardown_test(self):
		self.device_under_test.rootservice.StopStack(
		facade_rootservice_pb2.StopStackRequest()
		@@ -61,11 +63,11 @@ class SimpleHalTest(GdBaseTestClass):
		)

		def test_none_event(self):
		self.device_under_test.hal.hci_event_stream.clear_event_buffer()
		self.hci_event_stream.clear_event_buffer()

		self.device_under_test.hal.hci_event_stream.subscribe()
		self.device_under_test.hal.hci_event_stream.assert_none()
		self.device_under_test.hal.hci_event_stream.unsubscribe()
		self.hci_event_stream.subscribe()
		self.hci_event_stream.assert_none()
		self.hci_event_stream.unsubscribe()

		def test_example(self):
		response = self.device_under_test.hal.SetLoopbackMode(
		@@ -77,7 +79,7 @@ class SimpleHalTest(GdBaseTestClass):
		hal_facade_pb2.LoopbackModeSettings(enable=True)
		)

		self.device_under_test.hal.hci_event_stream.subscribe()
		self.hci_event_stream.subscribe()

		self.device_under_test.hal.SendHciCommand(
		hal_facade_pb2.HciCommandPacket(
		@@ -85,13 +87,13 @@ class SimpleHalTest(GdBaseTestClass):
		)
		)

		self.device_under_test.hal.hci_event_stream.assert_event_occurs(
		self.hci_event_stream.assert_event_occurs(
		lambda packet: packet.payload == b'\x19\x08\x01\x04\x053\x8b\x9e0\x01'
		)
		self.device_under_test.hal.hci_event_stream.unsubscribe()
		self.hci_event_stream.unsubscribe()

		def test_inquiry_from_dut(self):
		self.device_under_test.hal.hci_event_stream.subscribe()
		self.hci_event_stream.subscribe()

		self.cert_device.hal.SetScanMode(
		hal_cert_pb2.ScanModeSettings(mode=3)
		@@ -99,8 +101,8 @@ class SimpleHalTest(GdBaseTestClass):
		self.device_under_test.hal.SetInquiry(
		hal_facade_pb2.InquirySettings(length=0x30, num_responses=0xff)
		)
		self.device_under_test.hal.hci_event_stream.assert_event_occurs(
		self.hci_event_stream.assert_event_occurs(
		lambda packet: b'\x02\x0f' in packet.payload
		# Expecting an HCI Event (code 0x02, length 0x0f)
		)
		self.device_under_test.hal.hci_event_stream.unsubscribe()
		self.hci_event_stream.unsubscribe()