Commit Graph

4772 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
fff4665e6a Merge "Fix and deflake ConnectivityManagerTest" am: 591263914c am: 1d4d950451
Change-Id: I0b1dd2ad17b3c6460187d7e029ad787a7ba57824
2020-05-26 00:40:14 +00:00
Remi NGUYEN VAN
1d4d950451 Merge "Fix and deflake ConnectivityManagerTest" am: 591263914c
Change-Id: I8caf45c73d7fb9a44251d0403734c675064e0335
2020-05-26 00:25:56 +00:00
Remi NGUYEN VAN
591263914c Merge "Fix and deflake ConnectivityManagerTest" 2020-05-25 23:59:11 +00:00
Remi NGUYEN VAN
2f5879f6c7 Fix and deflake ConnectivityManagerTest
- Migrate the test to JUnit4, as JUnit3 cannot use assumeTrue
 - Skip IPv4 keepalive tests on networks that do not have native IPv4.
 - Refactor usage of adoptShellPermissionIdentity to use try / finally
   or runAsShellPermissionIdentity: test failures could lead to
   permission failures in other tests due to mismatched adopt/drop.
 - Fix ensureWifiConnected to support the "wifi enabled but not fully
   connected" case.

Bug: 150949391
Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest \
      --rerun-until-failure 50
Change-Id: I7459753b1068e1760a95337760db58d1df213fad
2020-05-25 19:15:39 +09:00
Remi NGUYEN VAN
deb1fca4e5 [automerger skipped] Merge "Add a cts test for PermissionMonitor security problem" am: c7cd60d9d4 am: b1e20af9bc -s ours
am skip reason: Change-Id I2c717a11bda43db166a55d343eb752ab45947fe8 with SHA-1 5a86f4b18a is in history

Change-Id: I542d55feeb19d951df96a65c804a46a66aaab1cc
2020-05-25 09:54:15 +00:00
Remi NGUYEN VAN
b1e20af9bc Merge "Add a cts test for PermissionMonitor security problem" am: c7cd60d9d4
Change-Id: I69979d9fdb77e8066f90cc2d88ff655fcd5f8b85
2020-05-25 09:32:32 +00:00
Remi NGUYEN VAN
c7cd60d9d4 Merge "Add a cts test for PermissionMonitor security problem" 2020-05-25 09:21:39 +00:00
paulhu
b568c3baa6 Add a cts test for PermissionMonitor security problem am: 5a86f4b18a
Change-Id: Iad7a6bc06d8d10787c70b99ccb559e9075d5917a
2020-05-25 08:13:18 +00:00
paulhu
5a86f4b18a Add a cts test for PermissionMonitor security problem
Add a cts test to check whether app can have netd sytem
permission even the app didn't grant the
CONNECTIVITY_USE_RESTRICTED_NETWORKS permission.

Bug: 144679405
Test: atest android.net.cts.ConnectivityManagerTest
Change-Id: I2c717a11bda43db166a55d343eb752ab45947fe8
Merged-In: I2c717a11bda43db166a55d343eb752ab45947fe8
(cherry picked from commit 1bc6b39789, ag/10285567)
2020-05-25 05:43:18 +00:00
Luke Huang
f45270dab9 Merge "Deflaky test for DnsResolverTest" am: 76fdd5976f am: 39edee84c8
Change-Id: I7fb9cab2b8ff2e2b42de94a3e7f9d3a4d0389b2f
2020-05-22 16:00:08 +00:00
Luke Huang
39edee84c8 Merge "Deflaky test for DnsResolverTest" am: 76fdd5976f
Change-Id: Id693a9bbeb3533515ccb8f3920e5e2602c5c841a
2020-05-22 15:47:28 +00:00
Luke Huang
76fdd5976f Merge "Deflaky test for DnsResolverTest" 2020-05-22 15:28:05 +00:00
Yan Yan
dee6ff4e4b Merge "Cleanup of IkeSessionPskTest" am: 27349420bd am: 762d3c0be1
Change-Id: Idf907ac333dc9c00077dfb92e82f9a578cb8aee2
2020-05-22 02:18:14 +00:00
Yan Yan
762d3c0be1 Merge "Cleanup of IkeSessionPskTest" am: 27349420bd
Change-Id: Ida17fac36eb6fcfe088c4e4a5c425ca305e78a14
2020-05-22 02:03:27 +00:00
Yan Yan
27349420bd Merge "Cleanup of IkeSessionPskTest" 2020-05-22 01:49:08 +00:00
Yan Yan
ad21ee4800 Merge "Exit test if device does not support IPsec tunnel" am: 32d03b84b6 am: 3a264ff900
Change-Id: Ic18d851039d7aae231845a9b3b5e0373caf8683f
2020-05-21 23:35:00 +00:00
Yan Yan
3a264ff900 Merge "Exit test if device does not support IPsec tunnel" am: 32d03b84b6
Change-Id: I7c2e36102ec1020a74d323d098484cf035b50340
2020-05-21 23:23:34 +00:00
evitayan
34e71a5b68 Cleanup of IkeSessionPskTest
- Add java doc in IkeSessionTestBase about the necessity to use
  different addresses and Networks in each test
- Use ArrayTrackRecord in Test Session Callback to retrieve the
  latest result.
- Verify that IpSecTransform pair is created and deleted

Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: Ib747c8cdfe1827e8df2aa7544e28e98a177d3d1c
2020-05-21 16:23:02 -07:00
Yan Yan
32d03b84b6 Merge "Exit test if device does not support IPsec tunnel" 2020-05-21 23:10:54 +00:00
Luke Huang
d6e36d820e Deflaky 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
0. Use opportunistic as default mode if no default mode existed.
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: 151122313
Bug: 150952393
Test: atest DnsResolverTest --rerun-until-failure 100
Test: forrest (git_master, cts/networking/gce-all)
Test: forrest (git_rvc-dev, atest CtsNetTestCases)
Test: forrest (git_rvc-dev, mts/dnsresolver/device-all)
Change-Id: I224a6493c87cebaf0bf954c2644e2945ccd50db1
2020-05-21 16:04:49 +08:00
TreeHugger Robot
a9e81620ff Merge "Create NetworkAgent CTS for NET_CAP_TEMP_NOT_METERED" into rvc-dev am: ed6b680e0c
Change-Id: I4e144146796c3281680532a54f714d5340f76e36
2020-05-21 05:40:08 +00:00
TreeHugger Robot
ed6b680e0c Merge "Create NetworkAgent CTS for NET_CAP_TEMP_NOT_METERED" into rvc-dev 2020-05-21 05:30:50 +00:00
Sarah Chin
f773b852ad [automerger skipped] Merge "Add cts for TEMPORARILY_NOT_METERED" am: bab248804b am: 4777f25a6e -s ours
am skip reason: Change-Id I6838dff70e6608f166119b99750db3bc59c59e42 with SHA-1 0a0d71f1ec is in history

Change-Id: I077cfb0ba6fb367e67fd42deca650a2a71235f2d
2020-05-21 02:05:34 +00:00
Sarah Chin
8e28d8789d Create NetworkAgent CTS for NET_CAP_TEMP_NOT_METERED
Test: atest NetworkAgentTest
Bug: 155993662
Change-Id: Ic968bf37075c23e9ea7d98eaec7f4f37d9ebc337
2020-05-20 18:58:21 -07:00
Sarah Chin
4777f25a6e Merge "Add cts for TEMPORARILY_NOT_METERED" am: bab248804b
Change-Id: Ie40c6ec697f646f5dda84b681af3929fdfff8683
2020-05-21 01:53:47 +00:00
Sarah Chin
bab248804b Merge "Add cts for TEMPORARILY_NOT_METERED" 2020-05-21 01:37:51 +00:00
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
ae36797b69 Add cts for TEMPORARILY_NOT_METERED
Bug: 155993662
Test: atest NetworkRequestTest
Change-Id: I6838dff70e6608f166119b99750db3bc59c59e42
Merged-In: I6838dff70e6608f166119b99750db3bc59c59e42
2020-05-20 17:27:55 -07:00
evitayan
677a1c1554 Exit test if device does not support IPsec tunnel
Bug: 155926216
Test: CtsIkeTestCases
Change-Id: I4e426b8f3509e56e7e2e7532e216533ad8bfbc2f
2020-05-20 15:18:32 -07: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