Commit Graph

2077 Commits

Author SHA1 Message Date
Xin Li
77065af37d Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:03:43 +00:00
Treehugger Robot
b974f51473 Merge "Don't require WiFi in CtsHostsideNetworkTests." 2020-09-01 09:15:35 +00:00
Tse Ho Lin
243c42a9b9 Don't require WiFi in CtsHostsideNetworkTests.
Skip test for non-WiFi connections.

Bug: 162192335
Test: run cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideNetworkCallbackTests#testOnBlockedStatusChanged_dataSaver
Change-Id: I7c20e3454a2fe81671162e0a50f90d64ed7516d0
2020-09-01 05:20:44 +00:00
Cody Kesting
cb00911ada Specify CAPABILITY_INTERNET for ConnDiags CTS test.
This CL updates the NetworkCapabilities used for getting a cellular
data network in ConnectivityDiagnosticsManagerTest to require
CAPABILITY_INTERNET.

Bug: 166732795
Test: atest CtsNetTestCases
Change-Id: Ia32ac00f949a2ee9319c80c25f294bfa834ad0f9
2020-08-31 11:00:26 -07:00
Xin Li
9d04ab0a42 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Id9ba142af9d2da12bda66d0c376d4b8c13f1503b
Change-Id: I1a1bdaabd06f43b695ac94172a6f46d00b7f5b84
2020-08-29 01:22:07 -07:00
Treehugger Robot
d863e35484 Merge "Add working internet precondition check" 2020-08-27 11:12:35 +00:00
Chiachang Wang
48d952a502 Add working internet precondition check
ConnectivityManagerTest expects a working internet before testing
but is not verified before each test. Add a working internet
check in setup to clearly test it.

Bug: 161370134
Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Change-Id: I47073ebff19fcf59d5d2ac86b43f8d54e621a55a
2020-08-27 17:58:48 +08:00
Remi NGUYEN VAN
c47fa617f2 Run validation tests even with an eth interface
The test actually does not need the ethernet interface to be the
only ethernet interface, as ethernet test interfaces now have
TRANSPORT_TEST|TRANSPORT_ETHERNET, which can be used to differentiate
them in the network request.

Bug: 162469293
Test: atest CtsNetTestCasesLatestSdk:NetworkValidationTest
Change-Id: I84cc8b6b9aaa764705d91ed298655d869c4388a6
2020-08-21 19:17:09 +09:00
Remi NGUYEN VAN
0e9b130cbc Add utilities for network validation testing
Refactor out TestHttpServer to share it between CaptivePortalApiTest and
CaptivePortalTest, move it to frameworks/libs/net, and add a
NetworkValidationTestUtil class with utilities to set the test
validation URLs.

Test: atest CtsNetTestCasesLatestSdk:CaptivePortal[Api]Test
Bug: 160617623
Bug: 160656765
Change-Id: Icd7829e680b2dddd1ddaa3dc2d946c14c20b5a15
2020-08-21 19:17:03 +09:00
Treehugger Robot
7b965d116d Merge "Add a dependency test for getFrequency" 2020-08-14 04:02:54 +00:00
Remi NGUYEN VAN
1cf2445443 Add a dependency test for getFrequency
WifiInfo#getFrequency is tested in CTS since R, but because it is used
on Q devices in the NetworkStack, it should be covered by MTS.
Because wifi should be connected to run this test, CTS is the best place
to add a test.

Bug: 160006669
Test: atest NetworkStackDependenciesTest
Change-Id: I0040c2a163ef5e1a3b725d5aedc67259d01ca173
2020-08-13 15:19:27 +09:00
Chalard Jean
7356e73849 Rename Kotlin util files to not include the Kt suffix
Callers don't care what language the utilities are written in

Test: builds
Change-Id: I06bf9838432e429b3d03649654e1bcef04b89dd9
2020-07-31 17:22:49 +09:00
Chalard Jean
6bf9a90a55 Merge "Move some utils to a more appropriate package/directory" 2020-07-31 00:44:46 +00:00
Sudheer Shanka
d0f158204f Merge "Update language to comply with Android’s inclusive language guidance." 2020-07-30 21:19:38 +00:00
Sudheer Shanka
2d4d72bc31 Update language to comply with Android’s inclusive language guidance.
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: n/a
Change-Id: I466bcd05d1cb5a5ba271bd4a7513c0e7dfa5145c
2020-07-29 20:09:33 +00:00
Chalard Jean
71b829649f Move some utils to a more appropriate package/directory
Test: builds
Change-Id: Id0f0f89c34502deb6d0e50503e5534fcc51c3f9b
2020-07-29 21:15:43 +09:00
Chiachang Wang
577c469d6b Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 05:44:57 +00:00
Chiachang Wang
59201b8e94 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code
for reference.

Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Bug: 161896447
Change-Id: I0c4be6060c66c75518629239703755c3fc5d99be
2020-07-29 11:58:48 +08:00
Sudheer Shanka
0a0d161fb3 Merge "Force the app idle state again after whitelisting it." into rvc-dev am: 2008be86fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12171299

Change-Id: Ifc7ac3392d0edcdc870b0ab72863a087dcf0b440
2020-07-17 22:56:01 +00:00
Sudheer Shanka
2008be86fd Merge "Force the app idle state again after whitelisting it." into rvc-dev 2020-07-17 22:48:44 +00:00
Sudheer Shanka
7c4bb75e1b Force the app idle state again after whitelisting it.
Whitelisting the app resets forced idle state of an app, so
forcing idle state again.

Bug: 161477606
Test: atest ./hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: Ib57202a68071cc02d6071e0dc2c4780f026ad90b
2020-07-16 14:00:27 -07:00
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
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
79b592dd26 Merge "Don't run testRequestLatestEntitlementResult if not supported" into rvc-dev 2020-07-13 16:04:39 +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
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
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
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
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
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
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
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
3cded8dc20 Merge "Let testB141603906 run over ADB-over-network" 2020-07-01 13:31:26 +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
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