Commit Graph

4948 Commits

Author SHA1 Message Date
Chiachang Wang
bf856bc2fa [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 -s ours am: 8ec2c4cf63 -s ours am: a968ebbdd3 -s ours
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 1136e51d55 is in history

Change-Id: Ic4b04976ed779be84f6b52def094d905f723278a
2020-04-22 13:56:24 +00:00
Chiachang Wang
8f953f23e3 [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 am: 471fd9a182 -s ours am: 679337e07e -s ours
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 6aac2067f6 is in history

Change-Id: I2ad62a7144e1213b9832c387b0d91df5615ee463
2020-04-22 13:56:19 +00:00
Chiachang Wang
a968ebbdd3 [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 -s ours am: 8ec2c4cf63 -s ours
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 1136e51d55 is in history

Change-Id: Ie897c6860417628c2300483b2112cdb876f016d0
2020-04-22 13:40:56 +00:00
Chiachang Wang
679337e07e [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 am: 471fd9a182 -s ours
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 6aac2067f6 is in history

Change-Id: Iedb3236127ec6526bd32c322f9c6f053e1869ccc
2020-04-22 13:40:26 +00:00
Chiachang Wang
8ec2c4cf63 [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 -s ours
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 6aac2067f6 is in history

Change-Id: I2350e0334ab809692ab98854e3bf8fd2329757d0
2020-04-22 13:28:59 +00:00
Chiachang Wang
471fd9a182 Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2
Change-Id: I1fc0c0a641b14b7137d9db1cc7f157865f293a2b
2020-04-22 13:28:44 +00:00
Lucas Lin
6f8b44ef89 [automerger skipped] Merge "Revert "Pull service dumps to help debug test failures."" am: 6ca20ffe6d am: 1817f6f907 -s ours am: b2937bb815 am: 348dcab8cc
Change-Id: I680614e0a38a405e9d105ec124d61233e3672676
2020-04-22 08:16:15 +00:00
Lucas Lin
348dcab8cc [automerger skipped] Merge "Revert "Pull service dumps to help debug test failures."" am: 6ca20ffe6d am: 1817f6f907 -s ours am: b2937bb815
Change-Id: Ibb8529f7d817a1971abf66efc04fd5325d9c19cc
2020-04-22 07:59:04 +00:00
Chiachang Wang
1136e51d55 Check target transport type for meterness change
When test case updates the wifi network from unmetered to
metered, test case will wait for wifi network reconnect.
However, if other metered networks are also connected at
the same time, test case may mis-take the network as the
target network. Thus, add transport type check to ensure
the transport type of the network is the expected one.

Bug: 153400606
Test: atest CtsNetTestCasesLatestSdk:\
      android.net.cts.ConnectivityManagerTest#\
      testGetMultipathPreference
Change-Id: I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92
Merged-In: I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92
(cherry picked from commit 495971d7b6abc65e6d506072038f499682f59f4d)
2020-04-22 07:52:57 +00:00
Lucas Lin
b2937bb815 [automerger skipped] Merge "Revert "Pull service dumps to help debug test failures."" am: 6ca20ffe6d am: 1817f6f907 -s ours
am skip reason: skipped by user lucaslin

Change-Id: I9ec34a339681090c0aac16ad3f358bb240b2e8ea
2020-04-22 07:37:52 +00:00
Chiachang Wang
4f97f84178 Merge "Check target transport type for meterness change" am: ac551dff33 am: 63592fd781 am: 8167ede0fd am: 82debfd479
Change-Id: Ic9bdc557210f41b92b861b876fa5dc22bcb449dc
2020-04-22 06:53:18 +00:00
Chiachang Wang
82debfd479 Merge "Check target transport type for meterness change" am: ac551dff33 am: 63592fd781 am: 8167ede0fd
Change-Id: Iac8339af8c8fba20818815fb9b363bdb2abd41d4
2020-04-22 06:36:58 +00:00
Chiachang Wang
8167ede0fd Merge "Check target transport type for meterness change" am: ac551dff33 am: 63592fd781
Change-Id: I59bcca1b2bcbbf7991139a25350359eacba945e3
2020-04-22 06:22:55 +00:00
Lucas Lin
1817f6f907 Merge "Revert "Pull service dumps to help debug test failures."" am: 6ca20ffe6d
Change-Id: Idbd647d3713be01261672df343173d7057f155d0
2020-04-22 06:05:06 +00:00
Chiachang Wang
63592fd781 Merge "Check target transport type for meterness change" am: ac551dff33
Change-Id: Ie9e3f1c02c9cc6b51c423154561150768614ab44
2020-04-22 06:04:56 +00:00
Lucas Lin
6ca20ffe6d Merge "Revert "Pull service dumps to help debug test failures."" 2020-04-22 05:56:52 +00:00
Chiachang Wang
ac551dff33 Merge "Check target transport type for meterness change" 2020-04-22 05:52:10 +00:00
Chiachang Wang
6aac2067f6 Check target transport type for meterness change
When test case updates the wifi network from unmetered to
metered, test case will wait for wifi network reconnect.
However, if other metered networks are also connected at
the same time, test case may mis-take the network as the
target network. Thus, add transport type check to ensure
the transport type of the network is the expected one.

Bug: 153400606
Test: atest CtsNetTestCasesLatestSdk:\
      android.net.cts.ConnectivityManagerTest#\
      testGetMultipathPreference
Change-Id: I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92
2020-04-22 05:51:39 +00:00
Tony Huang
89099548f8 Revert "Pull service dumps to help debug test failures."
This reverts commit e3711ae317.

Reason for revert: Might cause build break on errorprone branch

Change-Id: Iddece3edf4b1e96fafb8b36282f58410a2476025
2020-04-22 04:31:43 +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
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
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
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
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
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
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