summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Shi <kaishi@google.com>2024-03-12 15:39:20 -0700
committerKai Shi <kaishi@google.com>2024-03-13 11:23:51 -0700
commit1b62c4b8f76854e617941e3fcddeccef97a4191e (patch)
tree4d692d3e08bbbaed6c583dcb10381d18158ad099
parent6c4ab68b142df06e0648bea61611b827958c31bb (diff)
downloadplatform_testing-1b62c4b8f76854e617941e3fcddeccef97a4191e.tar.gz
Allow connection medium selection
Bug: 312235820 Test: betocq test Change-Id: Ic96bf334233a34aedd8b1f3cfe2259d0cd5bcf61
-rw-r--r--tests/bettertogether/quickstart/performance_test/local_nearby_share_testbed.yml1
-rw-r--r--tests/bettertogether/quickstart/performance_test/nc_constants.py1
-rw-r--r--tests/bettertogether/quickstart/performance_test/nearby_share_stress_test.py4
-rwxr-xr-xtests/bettertogether/quickstart/snippets/nearby_snippet.apkbin9454149 -> 9450219 bytes
-rwxr-xr-xtests/bettertogether/quickstart/snippets/nearby_snippet_2.apkbin9454149 -> 9450219 bytes
5 files changed, 5 insertions, 1 deletions
diff --git a/tests/bettertogether/quickstart/performance_test/local_nearby_share_testbed.yml b/tests/bettertogether/quickstart/performance_test/local_nearby_share_testbed.yml
index c6ea27a94..4cb465db4 100644
--- a/tests/bettertogether/quickstart/performance_test/local_nearby_share_testbed.yml
+++ b/tests/bettertogether/quickstart/performance_test/local_nearby_share_testbed.yml
@@ -2,6 +2,7 @@ x-test-params: &test-params
wifi_country_code: "US"
wifi_ssid: ""
wifi_password: ""
+ connection_medium: 1 # BT_ONLY = 1, BLE_ONLY = 2, BLE_L2CAP_ONLY = 8
upgrade_medium: 7 # WIFIAWARE_ONLY = 4, UPGRADE_TO_ALL_WIFI = 9, MEDIUM_UPGRADE_TO_WIFIDIRECT= 7
allow_unrooted_device: True
diff --git a/tests/bettertogether/quickstart/performance_test/nc_constants.py b/tests/bettertogether/quickstart/performance_test/nc_constants.py
index ad14481dc..e4173bfc8 100644
--- a/tests/bettertogether/quickstart/performance_test/nc_constants.py
+++ b/tests/bettertogether/quickstart/performance_test/nc_constants.py
@@ -99,6 +99,7 @@ class TestParameters:
)
payload_type: PayloadType = PayloadType.FILE
advertising_discovery_medium: int = NearbyMedium.BLE_ONLY
+ connection_medium: int = NearbyMedium.BT_ONLY
upgrade_medium: int = NearbyMedium.UPGRADE_TO_ALL_WIFI
allow_unrooted_device: bool = False
keep_alive_timeout_ms: int = KEEP_ALIVE_TIMEOUT_WIFI_MS
diff --git a/tests/bettertogether/quickstart/performance_test/nearby_share_stress_test.py b/tests/bettertogether/quickstart/performance_test/nearby_share_stress_test.py
index e33d18762..5d1062c55 100644
--- a/tests/bettertogether/quickstart/performance_test/nearby_share_stress_test.py
+++ b/tests/bettertogether/quickstart/performance_test/nearby_share_stress_test.py
@@ -130,7 +130,9 @@ class NearbyShareStressTest(nc_base_test.NCBaseTestClass):
self.advertiser.nearby,
self.discoverer.nearby,
advertising_discovery_medium=advertising_discovery_medium,
- connection_medium=nc_constants.NearbyMedium.BT_ONLY,
+ connection_medium=nc_constants.NearbyMedium(
+ self.test_parameters.connection_medium
+ ),
upgrade_medium=nc_constants.NearbyMedium(
self.test_parameters.upgrade_medium
),
diff --git a/tests/bettertogether/quickstart/snippets/nearby_snippet.apk b/tests/bettertogether/quickstart/snippets/nearby_snippet.apk
index b158da642..14384f0a9 100755
--- a/tests/bettertogether/quickstart/snippets/nearby_snippet.apk
+++ b/tests/bettertogether/quickstart/snippets/nearby_snippet.apk
Binary files differ
diff --git a/tests/bettertogether/quickstart/snippets/nearby_snippet_2.apk b/tests/bettertogether/quickstart/snippets/nearby_snippet_2.apk
index 94159b11b..c4d958f34 100755
--- a/tests/bettertogether/quickstart/snippets/nearby_snippet_2.apk
+++ b/tests/bettertogether/quickstart/snippets/nearby_snippet_2.apk
Binary files differ