Commit Graph

4743 Commits

Author SHA1 Message Date
Sarah Chin
5a0794bdef Merge "Add cts for TEMPORARILY_NOT_METERED" into rvc-dev am: bf6738e4f3
Change-Id: Ia0b154f22d094a7d2580bc29472a068389f20f4c
2020-05-21 00:35:22 +00:00
Sarah Chin
0a0d71f1ec Add cts for TEMPORARILY_NOT_METERED
Bug: 155993662
Test: atest NetworkRequestTest
Change-Id: I6838dff70e6608f166119b99750db3bc59c59e42
2020-05-20 15:03:38 -07:00
TreeHugger Robot
c7b7569e37 Merge "Apply MainlineTestModuleController to tethering cts tests" into rvc-dev am: eded3fd9be
Change-Id: I6a6e160507fe4c40bef9d28073c928af3317e3fa
2020-05-19 19:46:31 +00:00
TreeHugger Robot
eded3fd9be Merge "Apply MainlineTestModuleController to tethering cts tests" into rvc-dev 2020-05-19 19:32:00 +00:00
Chen Zhu
f021c464fd Apply MainlineTestModuleController to tethering cts tests
to only run them when com.google.android.tethering is

installed on device. This does not change any existing CTS run.

The logic only applies when the test triggered by mts-tradefed

to make sure it runs appropriate set of tests against the device.

For example, the test will be skipped when running MTS on Q because

tethering and wifi are not on Q devices.

Bug: 154845935
Test: m mts && mts-tradefed run mts-tethering
Change-Id: I9e6bd60982d4ef67538ad506e7008366bbf35363
2020-05-19 18:04:33 +00:00
Ken Chen
c6a0bc670c [automerger skipped] Merge "Fix CtsNetTestCasesLatestSdk fail on Q platform" into rvc-dev am: 37a3c0dec2 -s ours
am skip reason: Change-Id I5db3cb28829847e74412d270db7d17b81c5e26a2 with SHA-1 5dd02e3103 is in history

Change-Id: I84e51f20f2b1d4161e70d1479266a8890501e9cc
2020-05-19 15:45:10 +00:00
Remi NGUYEN VAN
e196a61cbb Fix CtsNetTestCasesLatestSdk fail on Q platform
The CtsNetTestCasesLatestSdk needs to build against platform (for hidden
API access), The JNI library libnativedns_jni used by
CtsNetTestCasesLatestSdk needs to build against stable SDK (for running
on Q). To fulfill the combination, property jni_uses_sdk_apis must be
set.

Bug: 151122313
Bug: 150904735
Bug: 150918852
Test: atest CtsNetTestCasesLatestSdk on R and Q platforms
Merged-In: I5db3cb28829847e74412d270db7d17b81c5e26a2
Change-Id: I8e9af302b487199b144f4fd791bc39d57f002fe2
(cherry picked from commit 452ef123caa60eeebc1744b14137197c47704d6b)
2020-05-19 10:10:15 +00:00
Luke Huang
da9f25a583 [automerger skipped] Merge "Revert "Fix flaky test for DnsResolverTest"" into rvc-dev am: 90c57f73d4 -s ours
am skip reason: Change-Id I083529616dbf80421ea6a322bb57d2bb0f2bca62 with SHA-1 dfa5480414 is in history

Change-Id: Ic3590e3e47ec829fd4aeab29a1d292cac155cfdf
2020-05-19 06:31:14 +00:00
Remi NGUYEN VAN
34ed50c9c7 Merge "Fix CtsNetTestCasesLatestSdk fail on Q platform" am: 114a0914bd am: 7211c19196
Change-Id: Ib137a55d060b05b91d4bafdbee20fd70e9342980
2020-05-19 04:53:39 +00:00
Remi NGUYEN VAN
7211c19196 Merge "Fix CtsNetTestCasesLatestSdk fail on Q platform" am: 114a0914bd
Change-Id: I16a1048ac92ecf1499f55a703346fa57b96931b4
2020-05-19 04:43:54 +00:00
Remi NGUYEN VAN
114a0914bd Merge "Fix CtsNetTestCasesLatestSdk fail on Q platform" 2020-05-19 04:27:39 +00:00
Luke Huang
ce6a5df073 Revert "Fix flaky test for DnsResolverTest"
This reverts commit dd9608b7d1147a4eaf36ea634b9fc2f0feca1145.

Reason for revert: This CL made whole test failed.

Bug: 153624005
Bug: 150952393
Bug: 151122313
Merged-In: I083529616dbf80421ea6a322bb57d2bb0f2bca62
Change-Id: I002c39d6535fb31b13bc463812517fe1882f1884
(cherry picked from commit 98015badd01863fa4a79c089f371d9a50f2ae98c)
2020-05-19 01:53:45 +00:00
Luke Huang
7a63584829 Merge "Revert "Fix flaky test for DnsResolverTest"" am: 430bcaa1f4 am: f33aae95c7
Change-Id: I002c39d6535fb31b13bc463812517fe1882f1884
2020-05-19 01:52:29 +00:00
Luke Huang
f33aae95c7 Merge "Revert "Fix flaky test for DnsResolverTest"" am: 430bcaa1f4
Change-Id: Ibbc118c40d9f75a4225fc8bd06d21f73c56f1adb
2020-05-19 01:26:39 +00:00
Luke Huang
dfa5480414 Revert "Fix flaky test for DnsResolverTest"
This reverts commit fb735de0e8.

Reason for revert: This CL made whole test failed.

Bug: 153624005
Bug: 150952393
Bug: 151122313
Change-Id: I083529616dbf80421ea6a322bb57d2bb0f2bca62
2020-05-19 01:18:49 +00:00
Ken Chen
5dd02e3103 Fix CtsNetTestCasesLatestSdk fail on Q platform
The CtsNetTestCasesLatestSdk needs to build against platform (for hidden
API access), The JNI library libnativedns_jni used by
CtsNetTestCasesLatestSdk needs to build against stable SDK (for running
on Q). To fulfill the combination, property jni_uses_sdk_apis must be
set.

Bug: 151122313
Bug: 150904735
Bug: 150918852
Test: atest CtsNetTestCasesLatestSdk on R and Q platforms
Change-Id: I5db3cb28829847e74412d270db7d17b81c5e26a2
2020-05-18 19:55:29 +08:00
Luke Huang
a568034bd1 [automerger skipped] Fix flaky test for DnsResolverTest am: 402077cc3a -s ours
am skip reason: Change-Id Iaed6285677f74a5ee6cc6684534ddc0758b25974 with SHA-1 fb735de0e8 is in history

Change-Id: Ic845fd65a2f16c233985ea97adbd1fddf577788d
2020-05-18 03:31:38 +00:00
Luke Huang
402077cc3a Fix flaky test for DnsResolverTest
It's possible that private DNS setting is not in the state we expected
when we tried to enable strict mode during tests. The problem here is
that there are 2 setting Uris(mode and specifier) relating to strict
mode, each of them might trigger private DNS setting changing evnet in
ConnectivityService.
Previously, we tried to enable strict mode with first set private DNS
mode and then private DNS specifier. This may result in 2 consecutive
private DNS changes events with very short intervals, which caused
conflicts between DnsResolver / NetworkMonitor and lead to flaky tests.

So
1. Change the order (mode and specifier) for enabling strict mode.
2. Change private DNS mode only when needed.
     (If original mode is "hostname", then we only need to set
     specifier)

Bug: 153624005
Bug: 153624702
Test: atest DnsResolverTest --rerun-until-failure 100
Merged-In: Iaed6285677f74a5ee6cc6684534ddc0758b25974
Change-Id: I566bdfa98dc070247b52fe29ca1f31cbd1bb8cc2
(cherry picked from commit 877af1ee3ed2c3a9e9256e216709908d2beb3bfb)
2020-05-18 02:40:06 +00:00
Paul Hu
e6fb6e5df9 [automerger skipped] Merge "Address aosp/1272946 leftover comment" into rvc-dev am: c0f0623482 -s ours
am skip reason: Change-Id I6272d7b297bdf0e641612a09ffe12942cc2b42e1 with SHA-1 e5e8ae9e1b is in history

Change-Id: I2c792e8e3dbeeafc840cdc1e3100a7209d331d7e
2020-05-18 01:44:27 +00:00
Paul Hu
c0f0623482 Merge "Address aosp/1272946 leftover comment" into rvc-dev 2020-05-18 01:37:41 +00:00
Luke Huang
07f4e98ab2 Merge "Fix flaky test for DnsResolverTest" am: 7207fc3400 am: 486e2eca5f
Change-Id: Ie22994f9c66941eb65053f688f848c9f8d22bd7c
2020-05-17 07:26:05 +00:00
Luke Huang
486e2eca5f Merge "Fix flaky test for DnsResolverTest" am: 7207fc3400
Change-Id: I60bc8560501761f000098fb959ab5a8edbc23a92
2020-05-17 07:03:29 +00:00
TreeHugger Robot
3a8e90d556 Merge "Ensure airplane mode is off." into rvc-dev am: 46a6b48d71
Change-Id: I647979bd2d6adfbfbc9e02ad2cc380e4af537d80
2020-05-15 21:19:51 +00:00
Kweku Adams
66c5773f79 Ensure airplane mode is off.
If the device is put into airplane mode before the network tests run,
the tests fail. This ensures that airplane mode is off before the tests
run.

Bug: 150788500
Test: atest CtsHostsideNetworkTests
Change-Id: I7a84be751e5e9efb534d48c6d8ff457875ebe716
2020-05-15 10:09:41 -07:00
Luke Huang
fb735de0e8 Fix flaky test for DnsResolverTest
It's possible that private DNS setting is not in the state we expected
when we tried to enable strict mode during tests. The problem here is
that there are 2 setting Uris(mode and specifier) relating to strict
mode, each of them might trigger private DNS setting changing evnet in
ConnectivityService.
Previously, we tried to enable strict mode with first set private DNS
mode and then private DNS specifier. This may result in 2 consecutive
private DNS changes events with very short intervals, which caused
conflicts between DnsResolver / NetworkMonitor and lead to flaky tests.

So
1. Change the order (mode and specifier) for enabling strict mode.
2. Change private DNS mode only when needed.
     (If original mode is "hostname", then we only need to set
     specifier)

Bug: 153624005
Bug: 153624702
Test: atest DnsResolverTest --rerun-until-failure 100
Change-Id: Iaed6285677f74a5ee6cc6684534ddc0758b25974
2020-05-15 23:39:19 +08:00
Paul Hu
30e4e9a202 Address aosp/1272946 leftover comment
Verify that entitlement check bypass with TETHER_ERROR_NO_ERROR
response.

Bug: 152829363
Test: atests CtsTetheringTest
Change-Id: I6272d7b297bdf0e641612a09ffe12942cc2b42e1
Merged-In: I6272d7b297bdf0e641612a09ffe12942cc2b42e1
(cherry picked from commit 92133d472ffbe6301db00c93060d76d90cdd02d2, aosp/1307453)
2020-05-15 08:24:46 +00:00
Paul Hu
8a66f06745 Merge "Address aosp/1272946 leftover comment" am: ebe9cb15a4 am: 1f9e324de0
Change-Id: I85fcc29ec0431fe147f442f507722cd7034a07af
2020-05-15 01:38:59 +00:00
Paul Hu
1f9e324de0 Merge "Address aosp/1272946 leftover comment" am: ebe9cb15a4
Change-Id: I24a71cc5dd7e6805b23b16c10bc3c000ac892774
2020-05-15 01:24:54 +00:00
Paul Hu
ebe9cb15a4 Merge "Address aosp/1272946 leftover comment" 2020-05-15 01:11:14 +00:00
Chiachang Wang
91f22916cc [automerger skipped] Merge "Move testInvariantInCanBeSatisfiedBy to be its own test" into rvc-dev am: 0acf7755b5 -s ours
am skip reason: Change-Id Id65b7189202108b232905535587f8a282e48007b with SHA-1 8ddd0227a9 is in history

Change-Id: I0175b15e737b35d5c0f8aa0d69423e3e0a76a205
2020-05-13 00:36:07 +00:00
Chiachang Wang
1621a260a2 Move testInvariantInCanBeSatisfiedBy to be its own test
Bug: 154451660
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Merged-In: Id65b7189202108b232905535587f8a282e48007b
Change-Id: Id65b7189202108b232905535587f8a282e48007b
2020-05-12 09:03:41 +00:00
Chiachang Wang
35a014f1be Merge "Move testInvariantInCanBeSatisfiedBy to be its own test" am: d40f746ea0 am: 224cd7a74f
Change-Id: I952f84434efafb04cb5b3fabc503af806160fcfc
2020-05-12 06:00:41 +00:00
Chiachang Wang
224cd7a74f Merge "Move testInvariantInCanBeSatisfiedBy to be its own test" am: d40f746ea0
Change-Id: I55eccca940812dfb4a842de31ccbfd858b1a2331
2020-05-12 05:50:26 +00:00
Chiachang Wang
e9dee1602e [automerger skipped] Merge "Use local defined NetworkSpecifier to verify test" into rvc-dev am: a5e957a467 -s ours
am skip reason: Change-Id I7e357c75a68244432231d59646ddf67c8d969c6d with SHA-1 a495965c67 is in history

Change-Id: I4a818d443aa5b5b5cbceda8b6ccf7d4950cdff57
2020-05-12 05:50:13 +00:00
Chiachang Wang
d40f746ea0 Merge "Move testInvariantInCanBeSatisfiedBy to be its own test" 2020-05-12 05:36:50 +00:00
Chiachang Wang
8ddd0227a9 Move testInvariantInCanBeSatisfiedBy to be its own test
Bug: 154451660
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Change-Id: Id65b7189202108b232905535587f8a282e48007b
2020-05-12 09:39:16 +08:00
Chiachang Wang
54978bda2d Use local defined NetworkSpecifier to verify test
Test will be affected by logic modification from different
NetworkSpecifiers. Since this test tries to test the behavior
of NetworkRequest but not NetworkSpecifier, use local defined
NetworkSpecifier to test to prevent repeating noisy breaks.
Also update test for testing invariant.

Bug: 154451660
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Merged-In: I7e357c75a68244432231d59646ddf67c8d969c6d
Change-Id: I7e357c75a68244432231d59646ddf67c8d969c6d
2020-05-12 00:51:06 +00:00
Chiachang Wang
5fcc5f375e Merge "Use local defined NetworkSpecifier to verify test" am: c23b2ac096 am: 85f6412866
Change-Id: Ib642615535f81c99e7548e36f9d77048f3bc3c4b
2020-05-11 14:45:53 +00:00
Chiachang Wang
85f6412866 Merge "Use local defined NetworkSpecifier to verify test" am: c23b2ac096
Change-Id: I49e3a182037652141e673ce54dad2daf7860d240
2020-05-11 14:35:53 +00:00
Chiachang Wang
c23b2ac096 Merge "Use local defined NetworkSpecifier to verify test" 2020-05-11 14:19:34 +00:00
Chiachang Wang
a495965c67 Use local defined NetworkSpecifier to verify test
Test will be affected by logic modification from different
NetworkSpecifiers. Since this test tries to test the behavior
of NetworkRequest but not NetworkSpecifier, use local defined
NetworkSpecifier to test to prevent repeating noisy breaks.
Also update test for testing invariant.

Bug: 154451660
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Change-Id: I7e357c75a68244432231d59646ddf67c8d969c6d
2020-05-11 20:24:47 +08:00
paulhu
e5e8ae9e1b Address aosp/1272946 leftover comment
Verify that entitlement check bypass with TETHER_ERROR_NO_ERROR
response.

Bug: 152829363
Test: atests CtsTetheringTest
Change-Id: I6272d7b297bdf0e641612a09ffe12942cc2b42e1
2020-05-11 15:27:35 +08:00
Lucas Lin
fc07b3cc86 [automerger skipped] Merge "Refine NetworkCallbackTest" am: ea89469f83 am: 06cb65fa80 -s ours
am skip reason: Change-Id I1aa0e107cf6797b06dee4a15896c63321d822156 with SHA-1 63203afe0e is in history

Change-Id: I8d2805d76fddb14c2b3f6d999ef08fb07be89241
2020-05-08 10:23:02 +00:00
Lucas Lin
06cb65fa80 Merge "Refine NetworkCallbackTest" am: ea89469f83
Change-Id: I5cb3c3b2340ad77bd89611abcb5e847b0c6b5767
2020-05-08 09:56:46 +00:00
Lucas Lin
ea89469f83 Merge "Refine NetworkCallbackTest" 2020-05-08 09:33:45 +00:00
lucaslin
5d57ec4a8f Refine NetworkCallbackTest
In R, to avoid data overages due to apps not detecting a
meteredness change, when a wifi network changes from unmetered
to metered the network will go down and will be replaced with a
new network. It will make NetworkCallbackTest fail because the
original design is getting the active network in setUp(). So once
the wifi reconnects, the network which is got in setUp() will be
meaningless and make the test fail due to network mismatches.
The new changes are:
1. Moving some initial pre-configurations into setUp().
2. Override the onCapabilitiesChanged() to check if network has
   changed to metered or not.
3. Add unregisterNetworkCallback() into iMyService.aidl so that
   NetworkCallbackTest can call it to unregister the network
   callback.
4. Enlarge the timeout of connecting network and receiving
   callback to prevent network cannot reconnect in time or
   callback cannot be received in a short time.

Bug: 153485744
Test: atest CtsHostsideNetworkTests:com.android.cts.net.HostsideNetworkCallbackTests
Change-Id: I1aa0e107cf6797b06dee4a15896c63321d822156
Merged-In: I1aa0e107cf6797b06dee4a15896c63321d822156
2020-05-08 08:01:34 +00:00
Lucas Lin
c2d786f684 Merge "Refine NetworkCallbackTest" into rvc-dev am: c06ab57a8d
Change-Id: I8fe5018d622b77dd2e1476544807ff9fe0225d66
2020-05-08 05:37:18 +00:00
Lucas Lin
c06ab57a8d Merge "Refine NetworkCallbackTest" into rvc-dev 2020-05-08 05:33:29 +00:00
lucaslin
63203afe0e Refine NetworkCallbackTest
In R, to avoid data overages due to apps not detecting a
meteredness change, when a wifi network changes from unmetered
to metered the network will go down and will be replaced with a
new network. It will make NetworkCallbackTest fail because the
original design is getting the active network in setUp(). So once
the wifi reconnects, the network which is got in setUp() will be
meaningless and make the test fail due to network mismatches.
The new changes are:
1. Moving some initial pre-configurations into setUp().
2. Override the onCapabilitiesChanged() to check if network has
   changed to metered or not.
3. Add unregisterNetworkCallback() into iMyService.aidl so that
   NetworkCallbackTest can call it to unregister the network
   callback.
4. Enlarge the timeout of connecting network and receiving
   callback to prevent network cannot reconnect in time or
   callback cannot be received in a short time.

Bug: 153485744
Test: atest CtsHostsideNetworkTests:com.android.cts.net.HostsideNetworkCallbackTests
Change-Id: I1aa0e107cf6797b06dee4a15896c63321d822156
2020-05-08 11:02:46 +08:00
Mark Chien
7b49dd5752 [automerger skipped] Tag CtsTetheringTest for sim card required am: a25d852b12 -s ours
am skip reason: Change-Id I79f841682049707d7cc26bf1ecc3e5affc86d196 with SHA-1 f941ae9c03 is in history

Change-Id: I1ea3350bc0b9aa5dc325e0d96bd61b26ccb2edfe
2020-05-07 11:36:59 +00:00