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

Commit 608c1556 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "avatar: enable bumble btsnoop logger" am: 8d3c22a8 am: cd3181b1 am:... 

Merge "avatar: enable bumble btsnoop logger" am: 8d3c22a8 am: cd3181b1 am: e9c77fd9 am: 4b5d0b75

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2502520



Change-Id: Ib882121ee075c9bf379f19f0e6832612d5fa5df8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d071f03 4b5d0b75

android/pandora/test/main.py

+25 −5
Original line number Original line Diff line number Diff line
@@ -2,14 +2,23 @@ import site 




site.main()

site.main()





import asha_test

import argparse

import example

import gatt_test

import le_advertising_test

import logging

import logging

import os

import sys

import sys





from argparse import Namespace

from mobly import suite_runner

from mobly import suite_runner

from typing import List, Tuple



_BUMBLE_BTSNOOP_FMT = 'bumble_btsnoop_{pid}_{instance}.log'





# Import test modules.

import asha_test

import example

import gatt_test

import le_advertising_test





_TEST_CLASSES_LIST = [

_TEST_CLASSES_LIST = [

    example.ExampleTest,

    example.ExampleTest,
@@ -19,6 +28,12 @@ _TEST_CLASSES_LIST = [ 
]

]









def _parse_cli_args() -> Tuple[Namespace, List[str]]:

    parser = argparse.ArgumentParser(description='Avatar test runner.')

    parser.add_argument('-o', '--log_path', type=str, metavar='<PATH>', help='Path to the test configuration file.')

    return parser.parse_known_args()





if __name__ == "__main__":

if __name__ == "__main__":

    logging.basicConfig(level=logging.INFO)

    logging.basicConfig(level=logging.INFO)
@@ -27,5 +42,10 @@ if __name__ == "__main__": 
        index = sys.argv.index('--')

        index = sys.argv.index('--')

        sys.argv = sys.argv[:1] + sys.argv[index + 1 :]

        sys.argv = sys.argv[:1] + sys.argv[index + 1 :]





    # Enable bumble snoop logger.

    ns, argv = _parse_cli_args()

    if ns.log_path:

        os.environ.setdefault('BUMBLE_SNOOPER', f'btsnoop:file:{ns.log_path}/{_BUMBLE_BTSNOOP_FMT}')



    # Run the test suite.

    # Run the test suite.

    suite_runner.run_suite(_TEST_CLASSES_LIST)  # type: ignore
 
    suite_runner.run_suite(_TEST_CLASSES_LIST, argv)  # type: ignore