Commit Graph

4815 Commits

Author SHA1 Message Date
Paul Hu
6791fbb084 [automerger skipped] Add TetheringCommonTests to CtsTetheringTest am: 11fec376f5 -s ours am: b37f3618f9 -s ours
am skip reason: Change-Id I26c06d522ef2935deb2b1abbd3c5b6be97a48a27 with SHA-1 11fec376f5 is in history

Change-Id: Ie42e96885438509f5647480ab4064a4c72b2107d
2020-04-23 08:34:45 +00:00
Paul Hu
8a61481338 [automerger skipped] Add TetheringCommonTests to CtsTetheringTest am: 11fec376f5 am: 13de869fa6 -s ours
am skip reason: Change-Id I26c06d522ef2935deb2b1abbd3c5b6be97a48a27 with SHA-1 6f203abeab is in history

Change-Id: Iaf1de0910b4c0390800b8338d447e912f5ac5753
2020-04-23 08:34:25 +00:00
Paul Hu
b37f3618f9 [automerger skipped] Add TetheringCommonTests to CtsTetheringTest am: 11fec376f5 -s ours
am skip reason: Change-Id I26c06d522ef2935deb2b1abbd3c5b6be97a48a27 with SHA-1 6f203abeab is in history

Change-Id: I3cfedc63e2bb1e3582f095c6959317f6f91d3d92
2020-04-23 08:16:45 +00:00
Paul Hu
13de869fa6 Add TetheringCommonTests to CtsTetheringTest am: 11fec376f5
Change-Id: I9a62b66c9dd41adf2745971646cd5e0b4fe2e18d
2020-04-23 08:16:39 +00:00
Paul Hu
11fec376f5 Add TetheringCommonTests to CtsTetheringTest
Bug: 153614365
Bug: 153613717
Test: atest CtsTetheringTest
Change-Id: I26c06d522ef2935deb2b1abbd3c5b6be97a48a27
Merged-In: I26c06d522ef2935deb2b1abbd3c5b6be97a48a27
(cherry picked from commit 9903c8a61b, aosp/1292434)
2020-04-23 05:44:02 +00:00
Paul Hu
83119e6317 Merge "Add TetheringCommonTests to CtsTetheringTest" am: e3ef038b64 am: 5401e02f81 am: d7ac864ef1
Change-Id: I40a43c5c20400075e7d51b736b6c4c6f40bea687
2020-04-23 03:24:10 +00:00
Paul Hu
d7ac864ef1 Merge "Add TetheringCommonTests to CtsTetheringTest" am: e3ef038b64 am: 5401e02f81
Change-Id: If81301869acf7629e060c981fe214ef75e4f7bab
2020-04-23 03:08:16 +00:00
Paul Hu
5401e02f81 Merge "Add TetheringCommonTests to CtsTetheringTest" am: e3ef038b64
Change-Id: I197a916efef48038a2c8a043f2d330c60a0cfbc3
2020-04-23 02:59:23 +00:00
Chiachang Wang
cf0b1574ba [automerger skipped] Merge "Update logic for checking NetworkSpecifier" into rvc-dev am: 0d39e96477 am: fe6682012b -s ours
am skip reason: Change-Id I14e2a5e629051e243f3b892b608cb1c6195cd8ed with SHA-1 36e4781181 is in history

Change-Id: I23a4f9552d7df73df7101a9f1120c7a39ca3db18
2020-04-23 02:59:15 +00:00
Chiachang Wang
fe6682012b Merge "Update logic for checking NetworkSpecifier" into rvc-dev am: 0d39e96477
Change-Id: I6f268364c283a343a587805b1c8a70c245e54769
2020-04-23 02:47:15 +00:00
Paul Hu
e3ef038b64 Merge "Add TetheringCommonTests to CtsTetheringTest" 2020-04-23 02:45:23 +00:00
Remi NGUYEN VAN
5f4e0fc7ed [automerger skipped] Merge "Fix test initialization errors on Q" into rvc-dev am: 203e783ccd am: d36b8ff614 -s ours
am skip reason: Change-Id I262b54c6897ed755adaeb2b118c638320634f7a1 with SHA-1 e96bd02054 is in history

Change-Id: I17f7ba95399419218f6d215b4c4eeffd54890ca0
2020-04-23 02:41:07 +00:00
Chiachang Wang
202dc6d0b3 [automerger skipped] Merge "Update logic for checking NetworkSpecifier" into rvc-dev am: 0d39e96477 -s ours am: c48c2dcf2e -s ours
am skip reason: Change-Id I14e2a5e629051e243f3b892b608cb1c6195cd8ed with SHA-1 6f63ef0e47 is in history

Change-Id: Iea699dfe2da028a7af6c21bb7ded2ef90cb728a2
2020-04-23 02:36:19 +00:00
Remi NGUYEN VAN
5b647e18e2 [automerger skipped] Merge "Fix test initialization errors on Q" into rvc-dev am: 203e783ccd -s ours am: 390874b40d -s ours
am skip reason: Change-Id I262b54c6897ed755adaeb2b118c638320634f7a1 with SHA-1 a7f8f2d01c is in history

Change-Id: I8aa7b0ce731fbde226c4f1ebdddcd66dd1e82c5f
2020-04-23 02:36:10 +00:00
Chiachang Wang
c48c2dcf2e [automerger skipped] Merge "Update logic for checking NetworkSpecifier" into rvc-dev am: 0d39e96477 -s ours
am skip reason: Change-Id I14e2a5e629051e243f3b892b608cb1c6195cd8ed with SHA-1 6f63ef0e47 is in history

Change-Id: I5553d41e5983952607edb47a34326a91f3523a07
2020-04-23 02:27:54 +00:00
Chiachang Wang
0d39e96477 Merge "Update logic for checking NetworkSpecifier" into rvc-dev 2020-04-23 02:27:03 +00:00
Remi NGUYEN VAN
390874b40d [automerger skipped] Merge "Fix test initialization errors on Q" into rvc-dev am: 203e783ccd -s ours
am skip reason: Change-Id I262b54c6897ed755adaeb2b118c638320634f7a1 with SHA-1 a7f8f2d01c is in history

Change-Id: I13a5e49edd39e64b9202333932eae307c3e19ede
2020-04-23 02:22:29 +00:00
Remi NGUYEN VAN
d36b8ff614 Merge "Fix test initialization errors on Q" into rvc-dev am: 203e783ccd
Change-Id: I2851e8d838823d8d0a3a775a8b03a9b513a96581
2020-04-23 02:22:23 +00:00
Remi NGUYEN VAN
203e783ccd Merge "Fix test initialization errors on Q" into rvc-dev 2020-04-23 02:10:04 +00:00
Treehugger Robot
36e4781181 Update logic for checking NetworkSpecifier
We cannot test using WifiNetworkSpecifier, because the matching
behaviour for null WifiNetworkSpecifier changed between Q and R.
Replace WifiNetworkSpecifier with MatchAllNetworkSpecifier and
TelephonyNetworkSpecifier that behave the same in both Q and R
to verify.

Bug: 154451660
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
      on aosp and internal build
Change-Id: I14e2a5e629051e243f3b892b608cb1c6195cd8ed
Merged-In: I14e2a5e629051e243f3b892b608cb1c6195cd8ed
(cherry picked from commit 902d572ca8)
2020-04-23 00:40:37 +00:00
Treehugger Robot
09b7b84b49 Merge "Update logic for checking NetworkSpecifier" am: eef8bc2050 am: 22bda590b7 am: 8f4fe7b880
Change-Id: I9a81c742ad5f929c4ddd7dba68fa101556be2a96
2020-04-22 16:37:22 +00:00
Treehugger Robot
8f4fe7b880 Merge "Update logic for checking NetworkSpecifier" am: eef8bc2050 am: 22bda590b7
Change-Id: If4ff3a3afc0385aed66ac954340b7d19f8396ccf
2020-04-22 16:36:52 +00:00
Treehugger Robot
22bda590b7 Merge "Update logic for checking NetworkSpecifier" am: eef8bc2050
Change-Id: Ifd4c3b1572c8957284ee57adcdc39ca8b9553859
2020-04-22 16:23:23 +00:00
Treehugger Robot
eef8bc2050 Merge "Update logic for checking NetworkSpecifier" 2020-04-22 16:11:26 +00:00
Chiachang Wang
6f63ef0e47 Update logic for checking NetworkSpecifier
We cannot test using WifiNetworkSpecifier, because the matching
behaviour for null WifiNetworkSpecifier changed between Q and R.
Replace WifiNetworkSpecifier with MatchAllNetworkSpecifier and
TelephonyNetworkSpecifier that behave the same in both Q and R
to verify.

Bug: 154451660
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
      on aosp and internal build
Change-Id: I14e2a5e629051e243f3b892b608cb1c6195cd8ed
2020-04-22 22:18:50 +08: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
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
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
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
paulhu
6f203abeab Add TetheringCommonTests to CtsTetheringTest
Bug: 153614365
Bug: 153613717
Test: atest CtsTetheringTest
Change-Id: I26c06d522ef2935deb2b1abbd3c5b6be97a48a27
2020-04-22 10:25:11 +08: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
e96bd02054 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
Merged-In: I262b54c6897ed755adaeb2b118c638320634f7a1
Change-Id: I262b54c6897ed755adaeb2b118c638320634f7a1
2020-04-21 13:40:28 +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