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

Commit ad881203 authored by Abel Lucas's avatar Abel Lucas Committed by Automerger Merge Worker
Browse files

Merge "avatar: multiple hot-fixes" am: e54a5b04 am: 4111dbdd am: e9365c00 

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



Change-Id: I518b6c916ae7e7a8c621f4be03b7589567b51aa3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6a1269c e9365c00

android/pandora/test/AndroidTest.xml

+4 −1
Original line number Diff line number Diff line
@@ -28,10 +28,13 @@ 
        <option name="host-background-command" value="adb -s $SERIAL shell nc -L -p 6211 nc 192.168.97.1 7300" />

        <option name="host-teardown-command" value="adb -s $SERIAL forward --remove tcp:6211" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="run-command" value="cmd bluetooth_manager enable" />

        <option name="run-command" value="cmd bluetooth_manager wait-for-state:STATE_ON" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.PythonVirtualenvPreparer">

        <option name="dep-module" value="grpcio==1.51.1" />

        <option name="dep-module" value="cryptography==35" />

        <option name="dep-module" value="appdirs==1.4.4" />

    </target_preparer>

    <test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest">

        <option name="mobly-par-file-name" value="avatar" />

android/pandora/test/asha_test.py

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ class ASHATest(base_test.BaseTestClass): # type: ignore[misc] 
        advertisement.cancel()

        return dut_ref, ref_dut



    def test_advertising_advertisment_data(self) -> None:

    def test_advertising_advertisement_data(self) -> None:

        """

        Ref starts ASHA advertisements with service data in advertisement data.

        DUT starts a service discovery.

android/pandora/test/avatar.sh

+4 −4
Original line number Diff line number Diff line
@@ -46,15 +46,15 @@ case "$1" in 
    pip install \

      'grpcio==1.51.1' \

      'protobuf==4.21.0' \

      'pyright==1.1.296' \

      'pyright==1.1.298' \

      'mypy==1.0' \

      'types-protobuf==4.21.0.3'

    export PYTHONPATH="$(IFS=:; echo "${_PANDORA_PYTHON_PATHS[*]}"):${PYTHONPATH}"

    pyright \

      -p "${_TEST_ROOT}" \

      "$@" "${_TEST_FILES[@]}"

    mypy \

      --pretty --show-column-numbers --strict --no-warn-unused-ignores --ignore-missing-imports \

      "$@" "${_TEST_FILES[@]}" || exit 1

    pyright \

      -p "${_TEST_ROOT}" \

      "$@" "${_TEST_FILES[@]}"

  ;;

  'run') shift

android/pandora/test/config.yml

+0 −2
Original line number Diff line number Diff line
@@ -13,10 +13,8 @@ TestBeds: 
    - transport: 'tcp-client:127.0.0.1:7300'

      classic_enabled: true

      class_of_device: 2360324

      keystore: 'JsonKeyStore'

      io_capability: display_output_only

    - transport: 'tcp-client:127.0.0.1:7300'

      classic_enabled: true

      class_of_device: 2360324

      keystore: 'JsonKeyStore'

    AndroidDevice: '*'

android/pandora/test/envsetup.sh

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ function avatar { 


  # only compile when needed.

  if [[ "$1" == "run" ]]; then

    m avatar avatar.sh PandoraServer tradefed

    m avatar avatar.sh PandoraServer tradefed || return 1

    _AVATAR="avatar.sh"

  fi