Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52f024b8 authored May 23, 2023 by Treehugger Robot Committed by Gerrit Code Review May 23, 2023

Merge "avatar: update tests after the bumble server move"

parents 8ab129fd 7a836bdb

android/pandora/test/asha_test.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,8 @@ import enum
		import grpc
		import logging

		from avatar import BumblePandoraDevice, PandoraDevice, PandoraDevices, asynchronous, bumble_server
		from avatar import BumblePandoraDevice, PandoraDevice, PandoraDevices, asynchronous
		from bumble import pandora as bumble_server
		from bumble.gatt import GATT_ASHA_SERVICE
		from bumble.pairing import PairingDelegate
		from bumble_experimental.asha import AshaGattService, AshaService

android/pandora/test/gatt_test.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,8 @@ import asyncio
		import avatar
		import logging

		from avatar import BumblePandoraDevice, PandoraDevice, PandoraDevices, bumble_server
		from avatar import BumblePandoraDevice, PandoraDevice, PandoraDevices
		from bumble import pandora as bumble_server
		from bumble.gatt import Characteristic, Service
		from bumble.pairing import PairingConfig
		from bumble_experimental.gatt import GATTService

pandora/server/bumble_experimental/asha.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ import grpc
		import logging
		import struct

		from avatar.bumble_server import utils
		from bumble.core import AdvertisingData
		from bumble.device import Connection, Connection as BumbleConnection, Device
		from bumble.gatt import (
		@@ -32,6 +31,7 @@ from bumble.gatt import (
		TemplateService,
		)
		from bumble.l2cap import Channel
		from bumble.pandora import utils
		from bumble.utils import AsyncRunner
		from google.protobuf.empty_pb2 import Empty # pytype: disable=pyi-error
		from pandora_experimental.asha_grpc_aio import AshaServicer

pandora/server/bumble_experimental/gatt.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,10 +16,10 @@ import asyncio
		import grpc
		import logging

		from avatar.bumble_server import utils
		from bumble.core import ProtocolError
		from bumble.device import Connection as BumbleConnection, Device, Peer
		from bumble.gatt_client import CharacteristicProxy, ServiceProxy
		from bumble.pandora import utils
		from pandora_experimental.gatt_grpc_aio import GATTServicer
		from pandora_experimental.gatt_pb2 import (
		SUCCESS,