Commit Graph

2152 Commits

Author SHA1 Message Date
Sudheer Shanka
edb6669cf1 Merge "Increase the wait timeout for meteredness to change." 2021-01-07 22:56:48 +00:00
Sudheer Shanka
796f29c09e Increase the wait timeout for meteredness to change.
Bug: 170241174
Bug: 174808291
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Change-Id: I3af17819a403958d88a30af7f6346e5bb96b2828
2021-01-05 06:37:56 +00:00
Chalard Jean
4f896db6ff Migrate away from AsyncChannel in NetworkAgent
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.

Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657

Change-Id: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657
2020-12-25 11:11:32 +09:00
Remi NGUYEN VAN
abb46bef36 Fix timeout on NetworkAgentTest callback
All callbacks in the class use the DEFAULT_TIMEOUT_MS, except for this recently
added test.

The test is currently flaky in various branches.
Fixes: 174716714
Fixes: 174691729
Change-Id: I9f4446bb83eb4402c912292ac31d46e1d2cb6a52
Test: TH
2020-12-16 06:29:20 +00:00
Remi NGUYEN VAN
9b6b353b5d Move cts/net/TEST_MAPPING to toplevel
The tests should just be run on any change in packages/modules/Connectivity,
not just changes in the CTS package.

Change-Id: I1c86c402f39a8a9b84e7422445df289c3ea7842f
Test: TEST_MAPPING needs to be verified by TH
2020-12-15 09:39:58 +00:00
Lorenzo Colitti
678d27faca Merge changes from topic "cs-generalize-underlying-networks"
* changes:
  Update NetworkAgentTest to support generalized underlying networks.
  Minor fixes to NetworkAgentTest.
2020-12-14 05:19:49 +00:00
Lorenzo Colitti
ed1211d2d8 Update NetworkAgentTest to support generalized underlying networks.
Currently, when an agent calls setUnderlyingNetworks, the
transports of the network are hardcoded to TRANSPORT_VPN only.
This is being fixed in another CL in this topic. The new code
reports the same transports sent by the agent.

This test registers an agent with TRANSPORT_TEST|TRANSPORT_VPN.
Update the test to expect both transports in the callbacks it
receives.

Bug: 173331190
Test: passes when run with other CL in topic
Change-Id: Iede61d74fa02a4fec1f345f6d18835c1acab7337
2020-12-12 22:57:06 +09:00
Lorenzo Colitti
cc3e994f16 Minor fixes to NetworkAgentTest.
- Use a more realistic routing config (instead of a LinkAddress
  with prefix length 0, an address with a mask of 32 and a
  default route).
- Use InetAddresses to parse IP addresses since it's a public API.
- Import the NET_CAPABILITY_xxx and TRANSPORT_xxx constants for
  readability.

Bug: 173331190
Test: test-only change
Change-Id: I9703d7dd5781f60fb3d531267d3f5370cbccd64f
2020-12-12 22:57:05 +09:00
Lorenzo Colitti
78f7c04770 Merge "Pass in proper NetworkCapabilities in testSetUnderlyingNetworks." 2020-12-09 00:11:23 +00:00
Lorenzo Colitti
977464ef5a Pass in proper NetworkCapabilities in testSetUnderlyingNetworks.
The CL that introduced testSetUnderlyingNetworks allowed tests to
pass in NetworkCapabilities when registering an agent, but
incorrectly always set the agent's capabilities anyway. This
resulted in testSetUnderlyingNetworks registering an agent with
TRANSPORT_VPN and NET_CAPABILITY_NOT_VPN.

Fix this by ensuring that createNetworkAgent either uses the
passed-in capabilities unmodified, or creates its own. Assert
that the test VPN network does not have NET_CAPABILITY_NOT_VPN.

While I'm at it, remove the manual unregistration of the callback
by using the registerNetworkCallback helper method.

Also add a little bit of extra test coverage.

Bug: 173331190
Test: test-only change
Change-Id: I114d876a1b2bf5344dd7c6fa23862df1c0a412c3
2020-12-08 01:15:32 +09:00
Remi NGUYEN VAN
d01761e07f Set noparent in connectivity CTS owners
Also reorganize the files to have one toplevel CTS owners file, and only
additional owners in subdirectories.

Change-Id: I28ce193896e1ade2034589327805870774a4d608
Test: m
2020-12-03 08:07:32 +00:00
Lorenzo Colitti
7d04b2a26c Merge "Add a CTS test for NetworkAgent#setUnderlyingNetworks." 2020-11-28 02:49:53 +00:00
Treehugger Robot
de39ae42ac Merge "Fix race condition in NetworkWatchListTest" 2020-11-27 10:12:05 +00:00
Lorenzo Colitti
3657ce9cda Add a CTS test for NetworkAgent#setUnderlyingNetworks.
Bug: 173331190
Test: atest CtsNetTestCases:NetworkAgentTest#testSetUnderlyingNetworks
Change-Id: I442a618d2d50eb15dbcb8926b60fc6fd0d5b2f3e
2020-11-27 18:09:24 +09:00
Remi NGUYEN VAN
d4430d28ba Merge "Add TEST_MAPPING config for CTS postsubmit" 2020-11-27 08:42:31 +00:00
Alan Stokes
36529b250a Fix race condition in NetworkWatchListTest
We were running cp to create a file and then running a command to read
the file. However were weren't waiting for the cp to finish (or,
indeed, start), so occasionally the read would fail saying the file
didn't exist.

Also added some logging, because diagnosing failure without it is
painful. Also simplify & improve file closing logic.

Some of this was previously submitted on internal master as change
I1c875102f0cce32cbbe2e3b36de913741c9abb92, but I've reverted that in
favor of this.

Bug: 168216494
Test: atest CtsNetTestCases:android.net.cts.NetworkWatchlistTest
Change-Id: I46a9db8b7a1885a9829f00bbd3233b863cfd1f5d
2020-11-26 14:27:39 +00:00
Treehugger Robot
1de9621925 Merge "Tune up TIMEOUTs of IPSec CTS for low end devices" 2020-11-25 19:56:50 +00:00
Remi NGUYEN VAN
1bc6287249 Add TEST_MAPPING config for CTS postsubmit
The new configuration runs tests on physical devices with SIM cards.
This is only done in postsubmit, as such tests can only run a few (~2) times a day due to
availability of the devices.

This configuration allows running all tests, so there is no annotation filter.

Change-Id: If95e4deeed8098327023f99e6e610331b8e86a0f
Test: TH validates TEST_MAPPING configurations
2020-11-25 18:27:48 +08:00
Junyu Lai
42fbb57b31 Merge changes from topic "TrafficStats.getTxRxBytes"
* changes:
  Exclude lingering traffic from loopback iface stats check
  Add CTS for getTx/RxBytes in TrafficStats
2020-11-25 02:35:20 +00:00
Chalard Jean
d639d12161 Merge "This bug was fixed in S, don't test for it in R" 2020-11-24 07:01:57 +00:00
Chalard Jean
e90c48c9aa This bug was fixed in S, don't test for it in R
Bug: 172401665
Test: CtsNetTestCasesLatestSdk
Change-Id: Ib9fb3ec09eeaebbb4ac1b1b458cfcc5c4f506cff
2020-11-20 17:54:26 +09:00
Cody Kesting
b9e51da2e8 Merge "Use READ_PHONE_STATE when checking Carrier Configs." 2020-11-17 17:54:09 +00:00
Yintang Gu
5c39147e5a Tune up TIMEOUTs of IPSec CTS for low end devices
Ikev2VpnTest#testStartStopVpnProfileV4 and testStartStopVpnProfileV6
contains the IKE sequences and requires the phone to send and receive
the required packet in 1000ms.
On some low end devices, the response time may exceeds this TIMEOUT
sometimes.
So we need to use larger timeouts.

Bug: 171176723
Change-Id: I005b83ffecd8ade5063000690bfd4136d82f1a07
2020-11-13 10:43:31 +08:00
Treehugger Robot
4eda64baca Merge "Add an owner for NetworkWatchlistTest." 2020-11-12 13:02:46 +00:00
Treehugger Robot
f5ae03550a Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" 2020-11-12 05:36:38 +00:00
Alan Stokes
108f82b463 Add an owner for NetworkWatchlistTest.
Test: N/A
Change-Id: Icfbeaf60e1ff98d29c449b9fcc43c0e5ce39a20e
2020-11-10 11:36:30 +00:00
junyulai
42ea4318f7 Exclude lingering traffic from loopback iface stats check
Lingering traffic from previous tests are only happens in
non-loopback interface. Stats gets from loopback interface
would not see them. Thus, exclude them from in-range check.

Test: atest TrafficStatsTest --rerun-until-failure 100
Bug: 164965653
Change-Id: Ic15c4c2e27f86b5711ada904c22734206c67d671
2020-11-10 10:11:14 +08:00
junyulai
549cc56731 Add CTS for getTx/RxBytes in TrafficStats
Test: atest TrafficStatsTest
Bug: 164965653
Change-Id: Ic3d253bbd036f40781d4f2706a67fb145ab4a575
2020-11-09 11:59:39 +08:00
Cody Kesting
a9bdde8881 Use READ_PHONE_STATE when checking Carrier Configs.
This CL Updates ConnectivityDiagnosticsManagerTest to explicitly use
the READ_PHONE_STATE permission when checking Carrier Configs for the
specified subId.

Bug: 169739061
Test: atest ConnectivityDiagnosticsManagerTest
Change-Id: I2307d7b03bcf9a918904a89be86777872a759293
2020-11-06 10:22:48 -08:00
Remi NGUYEN VAN
78cb3a9de0 Use CONNECTIVITY_INTERNAL on Q for portal URL
getCaptivePortalServerUrl requires CONNECTIVITY_INTERNAL or
MAINLINE_NETWORK_STACK on Q, and NETWORK_SETTINGS or
MAINLINE_NETWORK_STACK on R+.

Use CONNECTIVITY_INTERNAL on Q instead of NETWORK_SETTINGS to test it.

Bug: 172626873
Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Change-Id: I03309de945b198ad9b40d51d799d2619bb3179ea
2020-11-06 16:14:37 +09:00
Remi NGUYEN VAN
72c7fe9b0c Use ACCESS_WIFI_STATE when clearing wifi blacklist
Some tests using CtsNetUtils, like tethering CTS tests, do not hold
ACCESS_WIFI_STATE at install time. Use shell permissions to allow the
utility to work in such configurations.

Bug: 171621759
Test: atest CtsTetheringTest:TetheringManagerTest
Change-Id: I63e76918421e5deb59fe67a64674348fb8d20265
2020-11-06 10:46:52 +09:00
Luke Huang
fcabfc688d Fix minor bug and deflaky for DnsResolverTest
1. Add the missing countdown() in the test callback
2. Add ensureWifiConnected() to prevent no available network problem.
3. Increase the timeout for awaiting private DNS setting because
   current one might not be enough.

Bug: 168027339
Test atest

Change-Id: I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11
2020-11-04 16:03:10 +08:00
Treehugger Robot
9670ecfaa3 Merge "Fix MultinetworkApiTest for instant mode" 2020-10-30 13:28:53 +00:00
Weilun Du
aa00145105 Fix MultinetworkApiTest for instant mode
add AppModeFull@ to MultinetworkApiTest since CHANGE_NETWORK_STATE
could not be granted in instant mode.

CHANGE_NETWORK_STATE is required to select networks that are up but
not in the foreground, for example, the mobile network after the linger
timer has expired.

Bug: 168809106
Test: atest MultinetworkApiTest
      atest MultinetworkApiTest --instant

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I37ca1a0f58d1c2ab57f8cd4489c2cfb13b0f2d39
2020-10-30 10:22:06 +00:00
Chalard Jean
e3c9bb8545 Merge "Make sure agents start in the CONNECTING state" 2020-10-29 12:31:03 +00:00
Treehugger Robot
5ecf780e6e Merge "Don't run hotspot related tests if Soft AP is not supported" 2020-10-29 05:32:56 +00:00
markchien
8705535e40 Don't run hotspot related tests if Soft AP is not supported
Also explicitly hold ACCESS_WIFI_STATE permission to avoid
no permission problem when using WifiManager#getScanResults
without shell identity.

Fix: 169219565
Test: "atest CtsTetheringTest" in cuttlefish and phyical device

Change-Id: I3d8fa7e8882bf96f61f3316a70efdf991addbcb2
2020-10-29 11:10:46 +08:00
Dan Shi
98716c5cdc Add all CTS tests to general-tests suite
Exempt-From-Owner-Approval: this change only adds the tests to
general-tests.zip, doesn't change any test behavior.

Bug: 171481522
Test: none
Change-Id: I1711237f00572d57f611dcd16ec9ad345a0b5b3b
2020-10-27 22:25:33 +00:00
Remi NGUYEN VAN
1cdfeec47d Merge "Move apache HTTP tests out of tests/net" 2020-10-27 06:39:25 +00:00
Remi NGUYEN VAN
438200afb9 Move apache HTTP tests out of tests/net
The apache HTTP library is part of the platform core APIs, which are
separate from the core networking APIs.

cts/tests/tests/net is planned to move to a separate git project to put
it closer to the associated connectivity module code.

Bug: 170371348
Test: m cts && cts-tradefed run cts -m CtsApacheHttpTestCases
Change-Id: I49972b21755235e280c75eec40db14f3db974ca1
2020-10-27 11:07:04 +09:00
Treehugger Robot
7851370b12 Merge "Add com.google.android.resolv.apex and com.google.android.tethering.apex for CtsNetTestCasesLatestSdk." 2020-10-26 08:56:35 +00:00
easoncylee
48c4cf621d Add com.google.android.resolv.apex and com.google.android.tethering.apex
for CtsNetTestCasesLatestSdk.

Reference: https://android-review.googlesource.com/c/platform/cts/+/1331100/3/tests/tests/net/AndroidTestTemplate.xml#23

Bug: 160877913
Test: forrest.
Change-Id: If39c594a0fdc39a8a7272464fc59e2a1483f6d54
2020-10-23 13:10:56 +08:00
Remi NGUYEN VAN
0c70933916 Wait for connect before dropping permissions
WifiManager#connect is implemented with a oneway binder call, so it may
return before the permission check. The previous code could drop shell
permissions before the check is performed.

Use WifiManager.ActionListener to wait for the operation to end before
dropping permissions.

Also refactor current usages of various "run as shell" utilities to use
TestPermissionUtil.runAsShell, which is the "standard" utility used in
connectivity tests (both in CTS and in other tests).

Bug: 170371191
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalTest
Change-Id: I0f47c455f2c1596a887abab7d35146d8557d736a
2020-10-22 15:37:50 +09:00
Chalard Jean
845fa07bdc Make sure agents start in the CONNECTING state
Bug: 170904131
Test: this
Change-Id: I302b75c8e6606379c1887fa559b29bb4d29e0bdf
2020-10-17 01:03:44 +09:00
markchien
2888ab7bc7 Migrate Tethering util functions to CtsTetheringUtils
Bug: 166057846
Bug: 170265597
Test: atest MtsTetheringTest
      atest CtsTetheringTest
Change-Id: I59d529cb50b4b6cdafc6be78ad61a55ee1be0404
2020-10-16 17:11:20 +08:00
Yan Yan
d8f0f4a3c7 Merge "Migrate IPsec CTS out of tests/tests/net" 2020-10-15 17:30:49 +00:00
Yan Yan
b4d5a4b66f Migrate IPsec CTS out of tests/tests/net
Bug: 170487836
Test: atest CtsIkeTestCases
Change-Id: I08f069c2a11f3daa3f0332c631055a1e0be7ce7b
2020-10-14 10:58:37 -07:00
Treehugger Robot
b54ca7b0c3 Merge "Do not expect broadcasts in CaptivePortalTest" 2020-10-14 11:57:25 +00:00
Sudheer Shanka
468293beef Merge "Verify network state of apps hosting fg-service and in idle state." 2020-10-12 23:31:17 +00:00
xiamengsen
05c8a1ddd0 Verify network state of apps hosting fg-service and in idle state.
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java

Signed-off-by: xiamengsen <xiamengsen@xiaomi.com>
Change-Id: I0e6e40b714483e51cfee45c155d8ac8b2b356494
2020-10-12 18:42:00 +00:00