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

Commit 0cfb7f19 authored by Jack He's avatar Jack He Committed by Android (Google) Code Review
Browse files

Merge "Add Mobly test runner per SL4A_SL4A test script" into tm-dev

parents 086a9653 88d35e6d

system/blueberry/tests/sl4a_sl4a/gatt/gatt_connect_test.py

+7 −2
Original line number Original line Diff line number Diff line
@@ -23,13 +23,14 @@ from blueberry.tests.gd.cert.context import get_current_context 
from blueberry.tests.gd.cert.truth import assertThat

from blueberry.tests.gd.cert.truth import assertThat

from blueberry.tests.gd_sl4a.lib.bt_constants import adv_succ, ble_advertise_settings_modes, ble_scan_settings_modes, ble_address_types, ble_scan_settings_phys, gatt_connection_state_change, gatt_transport, scan_result

from blueberry.tests.gd_sl4a.lib.bt_constants import adv_succ, ble_advertise_settings_modes, ble_scan_settings_modes, ble_address_types, ble_scan_settings_phys, gatt_connection_state_change, gatt_transport, scan_result

from blueberry.tests.gd_sl4a.lib.ble_lib import generate_ble_scan_objects, generate_ble_advertise_objects

from blueberry.tests.gd_sl4a.lib.ble_lib import generate_ble_scan_objects, generate_ble_advertise_objects

from blueberry.tests.sl4a_sl4a.lib.sl4a_sl4a_base_test import Sl4aSl4aBaseTestClass

from blueberry.tests.sl4a_sl4a.lib import sl4a_sl4a_base_test

from blueberry.facade import common_pb2 as common

from blueberry.facade import common_pb2 as common





from mobly import test_runner

from mobly.controllers.android_device_lib.adb import AdbError

from mobly.controllers.android_device_lib.adb import AdbError









class GattConnectTest(Sl4aSl4aBaseTestClass):

class GattConnectTest(sl4a_sl4a_base_test.Sl4aSl4aBaseTestClass):





    def setup_class(self):

    def setup_class(self):

        super().setup_class()

        super().setup_class()
@@ -135,3 +136,7 @@ class GattConnectTest(Sl4aSl4aBaseTestClass): 




        # Test over

        # Test over

        self.cert.sl4a.bleStopBleAdvertising(advertise_callback)

        self.cert.sl4a.bleStopBleAdvertising(advertise_callback)





if __name__ == '__main__':

    test_runner.main()

system/blueberry/tests/sl4a_sl4a/sl4a_sl4a_device_config.yaml

+3 −3
Original line number Original line Diff line number Diff line
@@ -5,12 +5,12 @@ TestBeds: 
    AndroidDevice:

    AndroidDevice:

    - label: dut

    - label: dut

      # Preferred client port number on the PC host side for SL4A

      # Preferred client port number on the PC host side for SL4A

      client_port: '8895'

      client_port: '8893'

      # Preferred server port number forwarded from Android to the host PC

      # Preferred server port number forwarded from Android to the host PC

      # via adb for SL4A connections

      # via adb for SL4A connections

      forwarded_port: '8899'

      forwarded_port: '8897'

      # Preferred server port used by SL4A on Android device

      # Preferred server port used by SL4A on Android device

      server_port: '8899'

      server_port: '8897'

      serial: 'DUT'

      serial: 'DUT'

    - label: cert

    - label: cert

      # Preferred client port number on the PC host side for SL4A

      # Preferred client port number on the PC host side for SL4A