Commit Graph

5067 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
4e553a8d27 Merge "Auto-configure wifi on virtual devices" into rvc-dev am: bd340d8912
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11734678

Change-Id: I3fd084a6416a6902fb443a7696ba3a2064380b47
2020-07-16 13:40:29 +00:00
Remi NGUYEN VAN
bd340d8912 Merge "Auto-configure wifi on virtual devices" into rvc-dev 2020-07-16 13:25:51 +00:00
Chalard Jean
78c341cad0 Merge "Add ConnectivityManagerTest#testSetAirplaneMode" am: 7efcd4be05 am: 542057b81d
Original change: https://android-review.googlesource.com/c/platform/cts/+/1178309

Change-Id: I81cf7ccafbf4a0c751d7fd7915e54396aa3abf63
2020-07-16 12:04:02 +00:00
Chalard Jean
542057b81d Merge "Add ConnectivityManagerTest#testSetAirplaneMode" am: 7efcd4be05
Original change: https://android-review.googlesource.com/c/platform/cts/+/1178309

Change-Id: I5efb53fbd682c183b615e32ef73b7a3bb194ef94
2020-07-16 11:50:43 +00:00
TreeHugger Robot
5038b7000b [automerger skipped] Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" into rvc-dev am: 47b8426932 -s ours
am skip reason: Change-Id I8704cc5626a3e049eb3c27adb86e9c1a4d828273 with SHA-1 a1b13d6d39 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12121965

Change-Id: I8f8253ab1acb54a3d1690eef84e36af8d1f4f6fe
2020-07-16 03:01:39 +00:00
TreeHugger Robot
47b8426932 Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" into rvc-dev 2020-07-16 02:48:20 +00:00
Remi NGUYEN VAN
10980d136c Auto-configure wifi on virtual devices
At the moment tests run on virtual devices through TEST_MAPPING do not
necessarily have wifi configured to auto-connect to a test SSID.

This could be fixed by adding a TargetPreparer in AndroidTest.xml with a
given SSID, but that configuration would then apply to all runs,
including local ones. There is also no good way to apply a preparer that
configures wifi "if it is not already connected": WifiPreparer in
particular will not configure wifi even if just a mobile network is
active.

Implement auto-configuration in CtsNetUtils#connectToWifi so that if no
network is configured, and a virtual SSID is detected when scanning,
that SSID will be added to the list of configured networks. This allows
addressing the issue until TEST_MAPPING can support configuring wifi,
with minimal side-effects on other runs.

Test: atest CtsNetTestCasesLatestSdk:CaptivePortalTest
Bug: 158153057
Change-Id: I47df4c325b073f8a9bf320894245eed211606952
2020-07-16 10:07:37 +09:00
Edward Savage-Jones
241a767522 Add ConnectivityManagerTest#testSetAirplaneMode
Add a test to verify the NETWORK_AIRPLANE_MODE permission

Bug: 145164696
Test: atest android.net.cts.ConnectivityManagerTest#testSetAirplaneMode
Change-Id: I45c024f444988ec0c43d60778a1d9c9fd3acbdb5
2020-07-14 14:06:52 +00:00
TreeHugger Robot
e477716822 [automerger skipped] Merge "Don't run testRequestLatestEntitlementResult if not supported" into rvc-dev am: 79b592dd26 -s ours
am skip reason: Change-Id I65c32d5bc26f18f8c9d91593ab0c178e69e75c39 with SHA-1 b589520368 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12125016

Change-Id: Id3d5cb00c9aef291a9d342efa763516e29dffbd4
2020-07-13 16:19:30 +00:00
TreeHugger Robot
79b592dd26 Merge "Don't run testRequestLatestEntitlementResult if not supported" into rvc-dev 2020-07-13 16:04:39 +00:00
Chalard Jean
e985f78ec8 [automerger skipped] Merge "Ignore non-matching callbacks to fix flakiness" into rvc-dev am: 7117a52f6e -s ours
am skip reason: Change-Id I67c685ebfb2c5e2ee6f7615196eedea8292ca3ff with SHA-1 f70d762a55 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12121966

Change-Id: I977c3ca3ba8d4fc76004e4ec68ad780e3cdd2e07
2020-07-13 08:24:27 +00:00
Mark Chien
1e19cd613f Don't run testRequestLatestEntitlementResult if not supported
If tethering is not supported, skip testRequestLatestEntitlementResult
which test TetheringManager#requestLatestTetheringEntitlementResult
API.

Bug: 159869957
Test: atest CtsTetheringTest
Merged-In: I65c32d5bc26f18f8c9d91593ab0c178e69e75c39
Change-Id: I65c32d5bc26f18f8c9d91593ab0c178e69e75c39
2020-07-13 02:52:45 +00:00
Mark Chien
cf750de87c Merge "Don't run testRequestLatestEntitlementResult if not supported" am: 1129c316fd am: 793308371d
Original change: https://android-review.googlesource.com/c/platform/cts/+/1352284

Change-Id: I46d2d005d1a26c45f36cb387faa079a09ce708e4
2020-07-13 02:30:59 +00:00
Treehugger Robot
0a5ad58f9c Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" am: ce5d7c09ab am: 8d12e31a62
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331100

Change-Id: I167e3cd462e8ab0798c28b6b76c085f1a464cebb
2020-07-13 02:30:38 +00:00
Mark Chien
793308371d Merge "Don't run testRequestLatestEntitlementResult if not supported" am: 1129c316fd
Original change: https://android-review.googlesource.com/c/platform/cts/+/1352284

Change-Id: I2c0704ada44b23b511353cab8a52a396de52d692
2020-07-10 07:09:53 +00:00
Mark Chien
1129c316fd Merge "Don't run testRequestLatestEntitlementResult if not supported" 2020-07-10 07:06:56 +00:00
Chalard Jean
b6f64fb76c Ignore non-matching callbacks to fix flakiness
This is a host-side tests that receives its network callbacks
through a custom AIDL that proxies them to this host-side
process. As this runs of the real callbacks from a real network,
this test receives unrelated callbacks – in particular calls to
onCapabilitiesUpdated to warn the process of updates of the
signal strength.
This skips these callbacks across the board by only matching
the expected callback. This will fix flakiness in the test.

Also, as a drive-by fix, this also checks the network in
the onBlockedStatusChanged callback. If the network object
is not the expected one, the test should not pass.

Bug: 160270536
Test: NetworkCallbackTests
Original-Change: https://android-review.googlesource.com/1318219
Merged-In: I67c685ebfb2c5e2ee6f7615196eedea8292ca3ff
Change-Id: I67c685ebfb2c5e2ee6f7615196eedea8292ca3ff
2020-07-10 04:34:04 +00:00
Treehugger Robot
b872bb0d5e [automerger skipped] Increase a timeout that's too short am: eb41de1d35 -s ours
am skip reason: Change-Id If0587a2a91977427a2f679a502d838fbecdd82f2 with SHA-1 b7f471ae33 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12121963

Change-Id: I20d2d9d0d06396a8046de14ed99f353eef46c5c6
2020-07-10 04:16:22 +00:00
easoncylee
d6d19a9d92 Add CtsNetTestCasesLatestSdk to mainline-presubmit
This is the pilot run for mainline testing in Test Mapping Suite.

For supporting mainline testing in Test Mapping Suite, developers can
run tests by configuring the TEST_MAPPING file, the 3 simple steps are:
  - Add tests to be part of general-tests suite if the test does not
    depend on a device specific features.
  - Update test configureation for TradeFed to run mainline testing.
  - Update TEST_MAPPING file with test-group as "mainline-presubmit"

It's only for postsubmit now, and will be moved to actual presubmit
once the whole mechanism is stable.

For more details about the usage, please refer to go/test-mapping-mainline-user-guide

Bug: 160753366
Test: forrest.
Change-Id: I8704cc5626a3e049eb3c27adb86e9c1a4d828273
Merged-In: I8704cc5626a3e049eb3c27adb86e9c1a4d828273
2020-07-10 10:34:12 +08:00
Treehugger Robot
eb41de1d35 Increase a timeout that's too short
This should have been longer to start with. This oversight is due
to a poor API in TestNetworkCallback that was made that way for
backwards compatibility ; b/157405399 tracks improving this API.

Test: this
Bug: 160660082
Original-Change: https://android-review.googlesource.com/1358064
Merged-In: If0587a2a91977427a2f679a502d838fbecdd82f2
Change-Id: If0587a2a91977427a2f679a502d838fbecdd82f2
2020-07-10 01:13:50 +00:00
Treehugger Robot
8d12e31a62 Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" am: ce5d7c09ab
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331100

Change-Id: I6904cd64c4021bd3e5431ac0b66b481321b0470c
2020-07-10 00:49:01 +00:00
Treehugger Robot
ce5d7c09ab Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" 2020-07-10 00:36:44 +00:00
Treehugger Robot
68238567cd Merge "Increase a timeout that's too short" am: 6cc5d32e6f am: c2944b4510
Original change: https://android-review.googlesource.com/c/platform/cts/+/1358064

Change-Id: I8d079fc0a514d7ada44df54b986de50455a730d5
2020-07-09 15:35:53 +00:00
Treehugger Robot
c2944b4510 Merge "Increase a timeout that's too short" am: 6cc5d32e6f
Original change: https://android-review.googlesource.com/c/platform/cts/+/1358064

Change-Id: Ib6f94b8cc637add1d1fd4f2876b19d4b1c03f3a6
2020-07-09 15:23:29 +00:00
Treehugger Robot
6cc5d32e6f Merge "Increase a timeout that's too short" 2020-07-09 15:11:02 +00:00
Chalard Jean
a4ad47a46b Merge "Ignore non-matching callbacks to fix flakiness" am: 2e2642f909 am: b02ea3ecdd
Original change: https://android-review.googlesource.com/c/platform/cts/+/1318219

Change-Id: Id29544f27c6ede9f08354d630933083d1d21ef03
2020-07-09 06:40:18 +00:00
Chalard Jean
b7f471ae33 Increase a timeout that's too short
This should have been longer to start with. This oversight is due
to a poor API in TestNetworkCallback that was made that way for
backwards compatibility ; b/157405399 tracks improving this API.

Test: this
Bug: 160660082
Change-Id: If0587a2a91977427a2f679a502d838fbecdd82f2
2020-07-09 15:32:48 +09:00
Chalard Jean
b02ea3ecdd Merge "Ignore non-matching callbacks to fix flakiness" am: 2e2642f909
Original change: https://android-review.googlesource.com/c/platform/cts/+/1318219

Change-Id: Iedf444b13c9009d296869beb161ac1614095ae41
2020-07-09 06:25:29 +00:00
Chalard Jean
2e2642f909 Merge "Ignore non-matching callbacks to fix flakiness" 2020-07-09 06:12:45 +00:00
easoncylee
a1b13d6d39 Add CtsNetTestCasesLatestSdk to mainline-presubmit
This is the pilot run for mainline testing in Test Mapping Suite.

For supporting mainline testing in Test Mapping Suite, developers can
run tests by configuring the TEST_MAPPING file, the 3 simple steps are:
  - Add tests to be part of general-tests suite if the test does not
    depend on a device specific features.
  - Update test configureation for TradeFed to run mainline testing.
  - Update TEST_MAPPING file with test-group as "mainline-presubmit"

It's only for postsubmit now, and will be moved to actual presubmit
once the whole mechanism is stable.

For more details about the usage, please refer to go/test-mapping-mainline-user-guide

Bug: 160753366
Test: forrest.
Change-Id: I8704cc5626a3e049eb3c27adb86e9c1a4d828273
2020-07-08 15:13:27 +08:00
Treehugger Robot
378086af8f [automerger skipped] Merge "Create NetworkAgent CTS for NET_CAP_TEMP_NOT_METERED" am: 7dde88274a am: 35b8fb07a1 -s ours
am skip reason: Change-Id Ic968bf37075c23e9ea7d98eaec7f4f37d9ebc337 with SHA-1 8e28d8789d is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1316376

Change-Id: I49a169bf1874137bddf8faf44ed66b1b924217f3
2020-07-08 04:54:35 +00:00
Treehugger Robot
35b8fb07a1 Merge "Create NetworkAgent CTS for NET_CAP_TEMP_NOT_METERED" am: 7dde88274a
Original change: https://android-review.googlesource.com/c/platform/cts/+/1316376

Change-Id: Ia81dbc1a8a1c16daf6b82ef93014d6a4f75a969a
2020-07-08 04:43:35 +00:00
Treehugger Robot
7dde88274a Merge "Create NetworkAgent CTS for NET_CAP_TEMP_NOT_METERED" 2020-07-08 04:30:22 +00:00
Chalard Jean
f70d762a55 Ignore non-matching callbacks to fix flakiness
This is a host-side tests that receives its network callbacks
through a custom AIDL that proxies them to this host-side
process. As this runs of the real callbacks from a real network,
this test receives unrelated callbacks – in particular calls to
onCapabilitiesUpdated to warn the process of updates of the
signal strength.
This skips these callbacks across the board by only matching
the expected callback. This will fix flakiness in the test.

Also, as a drive-by fix, this also checks the network in
the onBlockedStatusChanged callback. If the network object
is not the expected one, the test should not pass.

Bug: 160270536
Test: NetworkCallbackTests
Change-Id: I67c685ebfb2c5e2ee6f7615196eedea8292ca3ff
2020-07-08 13:07:24 +09:00
Chalard Jean
6b297be291 [automerger skipped] Merge "Let testB141603906 run over ADB-over-network" into rvc-dev am: cbf0845a5d -s ours
am skip reason: Change-Id I0bc14d4d2cade7618c59b2cb88638bdf608d43d3 with SHA-1 5ed6690e66 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12056192

Change-Id: If42280e37ecbec29103108345128f86ef5ee2232
2020-07-02 23:38:45 +00:00
Chalard Jean
8742267b94 Let testB141603906 run over ADB-over-network
This test (added in R) failed to take the adb-over-network
case into account like most other tests in the same file. As
such it erroneously fails when tested over such a test setup.
This patch exempts the shell from being subject to the VPN,
like other similar tests do, to avoid the adb connections
being killed.

Test: VpnTest
Bug: 159761399
Original-Change: https://android-review.googlesource.com/1349862
Merged-In: I0bc14d4d2cade7618c59b2cb88638bdf608d43d3
Change-Id: I0bc14d4d2cade7618c59b2cb88638bdf608d43d3
2020-07-01 23:16:54 +00:00
Chalard Jean
db4f75ebeb Merge "Let testB141603906 run over ADB-over-network" am: 3cded8dc20 am: eb4d8b4fab
Original change: https://android-review.googlesource.com/c/platform/cts/+/1349862

Change-Id: Ie54c911ca55be520d20b582a67bb2bf36259b91c
2020-07-01 13:57:56 +00:00
Chalard Jean
eb4d8b4fab Merge "Let testB141603906 run over ADB-over-network" am: 3cded8dc20
Original change: https://android-review.googlesource.com/c/platform/cts/+/1349862

Change-Id: Id15fb6f4ad19061ffe1564030e5108910a2cc99d
2020-07-01 13:47:14 +00:00
Chalard Jean
3cded8dc20 Merge "Let testB141603906 run over ADB-over-network" 2020-07-01 13:31:26 +00:00
Jiyong Park
3001fbde9e [automerger skipped] Merge "Drop .stubs from android.test.[base|runner|mock].stubs" am: 188ebc6a7f am: 8fd64757cb -s ours
am skip reason: Change-Id I32502de3d87c5cfdbbcfe5545dd7db5e9bb551a7 with SHA-1 82bb526062 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1353494

Change-Id: I2e428f7780eec0401e9aae981a01bb440c620e7b
2020-07-01 12:21:52 +00:00
Jiyong Park
8fd64757cb Merge "Drop .stubs from android.test.[base|runner|mock].stubs" am: 188ebc6a7f
Original change: https://android-review.googlesource.com/c/platform/cts/+/1353494

Change-Id: I63b970f7edbc554bea6e9a587a27b90ce88edbac
2020-07-01 12:09:23 +00:00
Jiyong Park
188ebc6a7f Merge "Drop .stubs from android.test.[base|runner|mock].stubs" 2020-07-01 11:58:41 +00:00
Jiyong Park
616e299222 Drop .stubs from android.test.[base|runner|mock].stubs
The .stubs library refer to the stub library of a java_sdk_library.
Since the name of the stub library is the implementation detail of the
build system, direct use of the name should be prohibited. Actually,
clients don't need to use the stub name directly because the build
system automatically redirects <name> to <name>.stubs.

Exempt-From-Owner-Approval: too many owners are involved. This is a
simple build script change.

Bug: 157007292
Test: m
Merged-In: I32502de3d87c5cfdbbcfe5545dd7db5e9bb551a7
(cherry picked from commit 89c4e06853f7ea4b5a62a3b02b4f5113617b2c60)
Change-Id: I32502de3d87c5cfdbbcfe5545dd7db5e9bb551a7
2020-07-01 17:17:28 +09:00
Jiyong Park
2e220ff9a1 Merge "Drop .stubs from android.test.[base|runner|mock].stubs" into rvc-dev-plus-aosp 2020-07-01 08:07:47 +00:00
Remi NGUYEN VAN
0ccd0a124b [automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 4c602c3388 am: a88f1bcf28 -s ours
am skip reason: Change-Id Ic7534afe3a437f2089ed33cebdad391dc498d187 with SHA-1 484f0d4901 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1353486

Change-Id: I410edca2b6157bfe92def92b02eab8d8d05642c6
2020-07-01 04:29:13 +00:00
Remi NGUYEN VAN
a88f1bcf28 Merge "Move Inet[4]AddressUtils to libs/net" am: 4c602c3388
Original change: https://android-review.googlesource.com/c/platform/cts/+/1353486

Change-Id: I7d41b57d7c38f199696e6433e4d870bec6174f3a
2020-07-01 04:13:15 +00:00
Remi NGUYEN VAN
4c602c3388 Merge "Move Inet[4]AddressUtils to libs/net" 2020-07-01 04:08:25 +00:00
Remi NGUYEN VAN
ba6f3be791 Move Inet[4]AddressUtils to libs/net
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.

Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalApiTest
(clean cherry-pick from internal branch)
Merged-In: Ic7534afe3a437f2089ed33cebdad391dc498d187

Change-Id: Ic7534afe3a437f2089ed33cebdad391dc498d187
2020-06-30 19:20:40 +09:00
markchien
b589520368 Don't run testRequestLatestEntitlementResult if not supported
If tethering is not supported, skip testRequestLatestEntitlementResult
which test TetheringManager#requestLatestTetheringEntitlementResult
API.

Bug: 159869957
Test: atest CtsTetheringTest
Change-Id: I65c32d5bc26f18f8c9d91593ab0c178e69e75c39
2020-06-30 17:04:58 +08:00
Jiyong Park
82bb526062 Drop .stubs from android.test.[base|runner|mock].stubs
The .stubs library refer to the stub library of a java_sdk_library.
Since the name of the stub library is the implementation detail of the
build system, direct use of the name should be prohibited. Actually,
clients don't need to use the stub name directly because the build
system automatically redirects <name> to <name>.stubs.

Exempt-From-Owner-Approval: too many owners are involved. This is a
simple build script change.

Bug: 157007292
Test: m
Merged-In: I32502de3d87c5cfdbbcfe5545dd7db5e9bb551a7
(cherry picked from commit 4072d4d5d4)
Change-Id: I32502de3d87c5cfdbbcfe5545dd7db5e9bb551a7
2020-06-29 22:56:28 +09:00