Commit Graph

4585 Commits

Author SHA1 Message Date
Mark Chien
3928481da4 [automerger skipped] Merge "Test enable tethering permission and stopAllTethering" into rvc-dev am: 2cf72fecd3 -s ours
am skip reason: Change-Id I38702886ea355e1aec8eb8ac404fdd46a44582e3 with SHA-1 257cad8052 is in history

Change-Id: Ibb1747b13ce5dfcf1d2ee15d9656f58956aaa6a5
2020-04-23 17:01:01 +00:00
Mark Chien
f46d6a1e8d Test enable tethering permission and stopAllTethering
1. Test whether start tethering is gated by suitable permission.
2. Test stopAllTethering

Bug: 153613718
Test: atest CtsTetheringTest

Merged-In: I38702886ea355e1aec8eb8ac404fdd46a44582e3
Change-Id: I38702886ea355e1aec8eb8ac404fdd46a44582e3
2020-04-23 14:48:03 +00:00
Mark Chien
f7963a7f35 Merge "Test enable tethering permission and stopAllTethering" am: 34ec9b0db7 am: 39a164dfd0
Change-Id: Ie5bef87706d63f4ea2c09c2a6161290e7c5a88a3
2020-04-23 13:28:22 +00:00
Mark Chien
39a164dfd0 Merge "Test enable tethering permission and stopAllTethering" am: 34ec9b0db7
Change-Id: Ib650908fbb6e1fcb39689168e3d85e78c821e278
2020-04-23 13:14:52 +00:00
Mark Chien
34ec9b0db7 Merge "Test enable tethering permission and stopAllTethering" 2020-04-23 13:02:04 +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
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
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
Paul Hu
e3ef038b64 Merge "Add TetheringCommonTests to CtsTetheringTest" 2020-04-23 02:45:23 +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
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
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
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
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
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
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
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
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
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
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
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
markchien
257cad8052 Test enable tethering permission and stopAllTethering
1. Test whether start tethering is gated by suitable permission.
2. Test stopAllTethering

Bug: 153613718
Test: atest CtsTetheringTest

Change-Id: I38702886ea355e1aec8eb8ac404fdd46a44582e3
2020-04-20 22:44:43 +08: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
Chiachang Wang
db0b1c13e5 Merge "Update network object when wifi meterness is changed" 2020-04-20 13:35:54 +00:00