Commit Graph

5140 Commits

Author SHA1 Message Date
Lucas Lin
5999ca62c8 [automerger skipped] Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8 am: f9b42ca13b -s ours am: a20c0fee65 -s ours am: 4216947af6 -s ours am: c93658141e -s ours
am skip reason: Change-Id I93317c201a0ea06732e29154ab7e140735381f59 with SHA-1 09ae6d2645 is in history

Change-Id: I7a8ca1ffd6fe41a5e2ae8722e08cdb6cb0e640a3
2020-04-22 04:16:27 +00:00
Lucas Lin
c93658141e [automerger skipped] Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8 am: f9b42ca13b -s ours am: a20c0fee65 -s ours am: 4216947af6 -s ours
am skip reason: Change-Id I93317c201a0ea06732e29154ab7e140735381f59 with SHA-1 09ae6d2645 is in history

Change-Id: I261781f6cf9c594f16e61fb219c1cc7767f29860
2020-04-22 04:05:29 +00:00
Lucas Lin
4216947af6 [automerger skipped] Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8 am: f9b42ca13b -s ours am: a20c0fee65 -s ours
am skip reason: Change-Id I93317c201a0ea06732e29154ab7e140735381f59 with SHA-1 09ae6d2645 is in history

Change-Id: I79307e1bf2638848b9feefd2b66a21cab0f27be7
2020-04-22 03:46:36 +00:00
Lucas Lin
a20c0fee65 [automerger skipped] Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8 am: f9b42ca13b -s ours
am skip reason: Change-Id I93317c201a0ea06732e29154ab7e140735381f59 with SHA-1 09ae6d2645 is in history

Change-Id: I79a4c32a60c30db63b99430359247f5ea314f1b3
2020-04-22 03:22:00 +00:00
Lucas Lin
f9b42ca13b Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8
Change-Id: I1db74e2c46445e7d54cf6758f7c2aeaffbfd2447
2020-04-22 03:06:31 +00:00
Sudheer Shanka
e3711ae317 Pull service dumps to help debug test failures.
+ Convert tests to use Junit4
+ Add annotations to specify required conditions for the test to run.

Bug: 137859686
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideNetworkCallbackTests.java
Change-Id: I93317c201a0ea06732e29154ab7e140735381f59
Merged-In: I93317c201a0ea06732e29154ab7e140735381f59
2020-04-21 14:29:19 +00:00
Remi NGUYEN VAN
98089a8ef1 Merge "Fix test initialization errors on Q" am: 8b5e3031fa am: 2fcbc1b8ad am: 26e64df41a am: 8a1b79d28b am: 7e0e7139e0
Change-Id: I49088b219ffccb28540877f477bc6472bbc46a06
2020-04-21 13:22:31 +00:00
Remi NGUYEN VAN
7e0e7139e0 Merge "Fix test initialization errors on Q" am: 8b5e3031fa am: 2fcbc1b8ad am: 26e64df41a am: 8a1b79d28b
Change-Id: Icdab599563849295d34b788682ce1d5730c4383f
2020-04-21 13:08:29 +00:00
Remi NGUYEN VAN
8a1b79d28b Merge "Fix test initialization errors on Q" am: 8b5e3031fa am: 2fcbc1b8ad am: 26e64df41a
Change-Id: I5e7e87169f4984ccc659d16b4e64b401ccb4a079
2020-04-21 12:56:58 +00:00
Remi NGUYEN VAN
26e64df41a Merge "Fix test initialization errors on Q" am: 8b5e3031fa am: 2fcbc1b8ad
Change-Id: I2df5d37f74529e0fafae7f580c0795f30ab8959f
2020-04-21 12:42:37 +00:00
Remi NGUYEN VAN
2fcbc1b8ad Merge "Fix test initialization errors on Q" am: 8b5e3031fa
Change-Id: I1d87a67cb559e70d1aa501eef2575bef93eba196
2020-04-21 12:24:27 +00:00
Remi NGUYEN VAN
8b5e3031fa Merge "Fix test initialization errors on Q" 2020-04-21 12:07:03 +00:00
TreeHugger Robot
4b3dfa836b [automerger skipped] Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" into rvc-dev am: 39eee52a0e am: bcd9228cbf -s ours am: 61d343e6a0 -s ours am: d8dd6f7313 -s ours
am skip reason: Change-Id I22edc46039bf35e544d9ce8a9f3a00b713478e05 with SHA-1 6f8e612264 is in history

Change-Id: I810895d1a6a14db949d0d253ac1e32fb33d184a5
2020-04-21 12:06:18 +00:00
TreeHugger Robot
d8dd6f7313 [automerger skipped] Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" into rvc-dev am: 39eee52a0e am: bcd9228cbf -s ours am: 61d343e6a0 -s ours
am skip reason: Change-Id I22edc46039bf35e544d9ce8a9f3a00b713478e05 with SHA-1 6f8e612264 is in history

Change-Id: Ic3229d2af847db32c0ef03aa1cb5c9974b7f1c07
2020-04-21 11:41:44 +00:00
TreeHugger Robot
61d343e6a0 [automerger skipped] Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" into rvc-dev am: 39eee52a0e am: bcd9228cbf -s ours
am skip reason: Change-Id I22edc46039bf35e544d9ce8a9f3a00b713478e05 with SHA-1 6f8e612264 is in history

Change-Id: Ia4511013d1a4c4b8d3876c7b9e1366665f8db2eb
2020-04-21 11:31:10 +00:00
Chiachang Wang
eaf7e926d3 [automerger skipped] Update network object when wifi meterness is changed am: 3ee47d4233 am: e8e1d0aed9 -s ours am: cca3a8cb99 -s ours am: 82b5555331 -s ours
am skip reason: Change-Id Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38 with SHA-1 3ee47d4233 is in history

Change-Id: I17956f1db01f48eee8dc3b1c3f0b556e295fe9f6
2020-04-21 11:30:54 +00:00
TreeHugger Robot
bcd9228cbf Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" into rvc-dev am: 39eee52a0e
Change-Id: I039477ae98365e5ca70915a36d51580901bb7e0c
2020-04-21 11:30:36 +00:00
Remi NGUYEN VAN
7b0b1d004c Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b am: c96495c3b7 am: ecb10d57d1 am: 0fd7a1d9f8
Change-Id: I88fd5188c8d42655935fd15253cc546791e86bab
2020-04-21 11:30:29 +00:00
Chiachang Wang
82b5555331 [automerger skipped] Update network object when wifi meterness is changed am: 3ee47d4233 am: e8e1d0aed9 -s ours am: cca3a8cb99 -s ours
am skip reason: Change-Id Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38 with SHA-1 3ee47d4233 is in history

Change-Id: Ie10915f6d5f3048e3a1570532ad18ea7b134bb1f
2020-04-21 11:30:16 +00:00
Remi NGUYEN VAN
0fd7a1d9f8 Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b am: c96495c3b7 am: ecb10d57d1
Change-Id: I8427b8469f76d98588ae45ef97069901539055c7
2020-04-21 11:22:54 +00:00
Chiachang Wang
cca3a8cb99 [automerger skipped] Update network object when wifi meterness is changed am: 3ee47d4233 am: e8e1d0aed9 -s ours
am skip reason: Change-Id Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38 with SHA-1 3ee47d4233 is in history

Change-Id: Ie0ce2784aadf376a655e7bdb4eb5876e1337f054
2020-04-21 11:16:56 +00:00
Remi NGUYEN VAN
ecb10d57d1 Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b am: c96495c3b7
Change-Id: I63a93aa6ee492170c73e1ee5d236a108cb7ff100
2020-04-21 11:06:01 +00:00
Chiachang Wang
e8e1d0aed9 Update network object when wifi meterness is changed am: 3ee47d4233
Change-Id: Ia069c926fd98582b86879d3c69dd419c99f06e27
2020-04-21 10:59:50 +00:00
Remi NGUYEN VAN
c96495c3b7 Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b
Change-Id: I8c80a456633c456a827f3a710cba4f23b8421a1f
2020-04-21 10:56:54 +00:00
TreeHugger Robot
66c334c4ab [automerger skipped] Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" into rvc-dev am: 39eee52a0e -s ours am: 98d94e161f -s ours am: 2d9d955542 -s ours am: 3e11ae52b6 -s ours
am skip reason: Change-Id I22edc46039bf35e544d9ce8a9f3a00b713478e05 with SHA-1 fd43b2d3e8 is in history

Change-Id: Ia8866adfbd4029f92a9bc8baabab2e536205650b
2020-04-21 06:34:09 +00:00
Remi NGUYEN VAN
a7f8f2d01c Fix test initialization errors on Q
ConnectivityDiagnosticsManagerTest, MultinetworkApiTest,
NetworkAgentTest crashed before the runner could start them:
 - Ignore ConnectivityDiagnosticsManagerTest on Q: it tests an API that
   was introduced in R.
 - Build JNI libraries used by MultinetworkApiTest against the NDK to
   avoid errors loading the libraries on older platforms, when
   transitive dependencies have been added.
 - Do not attempt to override Handler#getLooper() (which is final) in
   NetworkAgentTest; it appears to have been overridden by accident by
   specifying "val looper" in the TestableNetworkAgent definition, which
   generates a getter.

Test: atest CtsNetTestCasesLatestSdk:ConnectivityDiagnosticsManagerTest
      atest CtsNetTestCasesLatestSdk:MultinetworkApiTest
      atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Bug: 150918852
Change-Id: I262b54c6897ed755adaeb2b118c638320634f7a1
2020-04-21 15:16:44 +09:00
TreeHugger Robot
3e11ae52b6 [automerger skipped] Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" into rvc-dev am: 39eee52a0e -s ours am: 98d94e161f -s ours am: 2d9d955542 -s ours
am skip reason: Change-Id I22edc46039bf35e544d9ce8a9f3a00b713478e05 with SHA-1 fd43b2d3e8 is in history

Change-Id: If72443e1e8089cfbf0fac871d74d373c715d27fb
2020-04-21 06:14:58 +00:00
TreeHugger Robot
2d9d955542 [automerger skipped] Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" into rvc-dev am: 39eee52a0e -s ours am: 98d94e161f -s ours
am skip reason: Change-Id I22edc46039bf35e544d9ce8a9f3a00b713478e05 with SHA-1 fd43b2d3e8 is in history

Change-Id: I51c9cf969b0b9a5c22182e217b8c559ce77b5497
2020-04-21 06:01:31 +00:00
TreeHugger Robot
98d94e161f [automerger skipped] Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" into rvc-dev am: 39eee52a0e -s ours
am skip reason: Change-Id I22edc46039bf35e544d9ce8a9f3a00b713478e05 with SHA-1 fd43b2d3e8 is in history

Change-Id: I35f7aa49d7b4a8fef49d34354056bf04cb12c1c3
2020-04-21 05:47:35 +00:00
Junyu Lai
6f8e612264 Remove upper bound check of getTotal* APIs in TrafficStatsTest
Currently, this cause flakiness since some background traffic
was counted when performing tests, or the traffic generated by
adb over network. While there is no good way to filter out all
reasonable cases, disable the upper bound checks.

Test: atest TrafficStatsTest
Bug: 142978584

Change-Id: I22edc46039bf35e544d9ce8a9f3a00b713478e05
Merged-In: I22edc46039bf35e544d9ce8a9f3a00b713478e05
Merged-In: I8140310c9caeff6069d1f55590bf40f83bf211e4
(cherry picked from commit 8accc6aa11213a7a8287a2ec0f75f17a02173f99)
2020-04-21 04:32:05 +00:00
Junyu Lai
bcd20b9f42 Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" am: 9eba1b2c1b am: e331edcd23 am: fd43b2d3e8 am: 8e377d8e93 am: 8510988217
Change-Id: I177803086d186e6cc44519331646bdafaf38852c
2020-04-21 04:30:37 +00:00
Chiachang Wang
9f425e1a4d [automerger skipped] Update network object when wifi meterness is changed am: 3ee47d4233 -s ours am: dc0d0ccf4c -s ours am: 14408b1739 -s ours am: 80f6a3910e -s ours
am skip reason: Change-Id Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38 with SHA-1 21ec1de1ff is in history

Change-Id: Ia82d57d4d4d52c074fceff44039c2a2bd995e6fe
2020-04-21 04:29:54 +00:00
Junyu Lai
8510988217 Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" am: 9eba1b2c1b am: e331edcd23 am: fd43b2d3e8 am: 8e377d8e93
Change-Id: I56a93591a4414427b4836b8fb40f40a9493b39b0
2020-04-21 04:15:24 +00:00
Chiachang Wang
80f6a3910e [automerger skipped] Update network object when wifi meterness is changed am: 3ee47d4233 -s ours am: dc0d0ccf4c -s ours am: 14408b1739 -s ours
am skip reason: Change-Id Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38 with SHA-1 21ec1de1ff is in history

Change-Id: I449e619abeb38b69c7ea04b506b1997a579de6be
2020-04-21 04:14:47 +00:00
Junyu Lai
8e377d8e93 Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" am: 9eba1b2c1b am: e331edcd23 am: fd43b2d3e8
Change-Id: I7f4804fe542907a1f0245ec15bdeca2ec38b0f0e
2020-04-21 03:55:21 +00:00
Chiachang Wang
14408b1739 [automerger skipped] Update network object when wifi meterness is changed am: 3ee47d4233 -s ours am: dc0d0ccf4c -s ours
am skip reason: Change-Id Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38 with SHA-1 21ec1de1ff is in history

Change-Id: Ib20c68fd0013542a98be4a324bad29bb6dd5c742
2020-04-21 03:54:42 +00:00
Junyu Lai
fd43b2d3e8 Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" am: 9eba1b2c1b am: e331edcd23
Change-Id: I22edc46039bf35e544d9ce8a9f3a00b713478e05
2020-04-21 03:46:08 +00:00
Chiachang Wang
dc0d0ccf4c [automerger skipped] Update network object when wifi meterness is changed am: 3ee47d4233 -s ours
am skip reason: Change-Id Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38 with SHA-1 21ec1de1ff is in history

Change-Id: Iacc5d6d1803ec6b6c6a2edc076d98b7d16871d86
2020-04-21 03:35:40 +00:00
Junyu Lai
e331edcd23 Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" am: 9eba1b2c1b
Change-Id: Ic25bb9d4649d404c9467b36a173483f01082754e
2020-04-21 03:22:39 +00:00
Junyu Lai
9eba1b2c1b Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" 2020-04-21 03:07:58 +00:00
Remi NGUYEN VAN
c708aab538 Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b am: a8b5e991f0 am: ea136165eb am: 26ec480659
Change-Id: I124111c3af2539d49eaf0922a024566fdd53bba2
2020-04-21 02:34:25 +00:00
Remi NGUYEN VAN
26ec480659 Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b am: a8b5e991f0 am: ea136165eb
Change-Id: I85d7ba2dc89fd6fd57bcd5541bbb192e175e3baf
2020-04-21 02:22:36 +00:00
Remi NGUYEN VAN
ea136165eb Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b am: a8b5e991f0
Change-Id: Ia8dc75dbe7a697f11cc461e3495286f77654dce3
2020-04-21 02:04:59 +00:00
Remi NGUYEN VAN
a8b5e991f0 Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b
Change-Id: Id256409f395859b010ca09bcf8e91737f22eeac9
2020-04-21 01:42:18 +00:00
Chiachang Wang
3ee47d4233 Update network object when wifi meterness is changed
The new wifi disconnect behavior is introduced. When wifi
network is changed from unmetered to metered, the wifi
network will disconnect and reconnect. Update the test to
verify the same SSID wifi is connected and also update the
target network to verfiy the metered preference.

Bug: 153400606
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest\
      #testGetMultipathPreference
Change-Id: Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38
Merged-In: Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38
(cherry picked from commit 37d5d4387cce865d159e80e5101685b4c2a13731)
2020-04-21 01:35:49 +00:00
Chiachang Wang
8b18be751e Merge "Update network object when wifi meterness is changed" am: db0b1c13e5 am: 7c111f53bf am: b14bd1af58 am: 4cda12d551 am: 4d5a128eec
Change-Id: Ic37510844dd5a95bda2ca94a3a559388691e3212
2020-04-20 15:15:58 +00:00
Chiachang Wang
4d5a128eec Merge "Update network object when wifi meterness is changed" am: db0b1c13e5 am: 7c111f53bf am: b14bd1af58 am: 4cda12d551
Change-Id: I75e89abae621217fa5a2bc4b53c2de12a7fcbc7c
2020-04-20 14:53:22 +00:00
Chiachang Wang
4cda12d551 Merge "Update network object when wifi meterness is changed" am: db0b1c13e5 am: 7c111f53bf am: b14bd1af58
Change-Id: I064dc2274805291a999ed4d79a218aa0498fcc96
2020-04-20 14:37:33 +00:00
Chiachang Wang
b14bd1af58 Merge "Update network object when wifi meterness is changed" am: db0b1c13e5 am: 7c111f53bf
Change-Id: I7ec9f0b04fa8b5a77cc7856359171134b9ec7e35
2020-04-20 14:13:04 +00:00
Chiachang Wang
7c111f53bf Merge "Update network object when wifi meterness is changed" am: db0b1c13e5
Change-Id: If549b492ef667b833990df7f8935fc9da0220574
2020-04-20 13:56:14 +00:00