Commit Graph

4617 Commits

Author SHA1 Message Date
Treehugger Robot
22da660983 Merge "Test legacy tether/untether API and onError callback" am: c31694df4c am: b8e44e87b3
Change-Id: I8a6b617bd1e43e8689b92c00349bf72e155fd94d
2020-04-24 16:00:43 +00:00
Treehugger Robot
b8e44e87b3 Merge "Test legacy tether/untether API and onError callback" am: c31694df4c
Change-Id: If9a821510f0e1117faf3d12808753fd3e2535adf
2020-04-24 15:44:37 +00:00
Treehugger Robot
c31694df4c Merge "Test legacy tether/untether API and onError callback" 2020-04-24 15:29:44 +00:00
markchien
1a54afc5b1 Test legacy tether/untether API and onError callback
Test legacy tether/untether API behavior. tether() rely on downstream
setup ready for tethering. Currently the only user is bluetooth
tethering. For other tetherings, there is no guaranteed that calling
tether() can always switch given interface to tethered. Tethering
may callback with onError depend on the interface status. Caller
should use startTethering/stopTethering API instead of these
legacy APIs.

This change also change the precondition verification of startTethering.
If tethering interface got error last time, such interface would not
be reported as tetherable.

Bug: 150632712
Test: atest CtsTetheringTest
Change-Id: Ifb3a0618208ffd0ff224c60f377036bc22ba0565
2020-04-24 21:16:06 +08:00
TreeHugger Robot
38bd84d94e [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: Ie70f26552e41ba517d80067fad37cabf1980f5cb
2020-04-24 06:27:15 +00:00
TreeHugger Robot
25cd61eb7e Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev 2020-04-24 06:15:12 +00:00
Sudheer Shanka
f5af3d7527 [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I7964684d586048225998b2956500b96d8f57988c
2020-04-24 03:15:54 +00:00
Sudheer Shanka
4cd0f56bea Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master
* changes:
  Ensure location is enabled before getting SSID.
  Fix a regression in how required properties are collected.
  Fix Error Prone errors
  Reland "Pull service dumps to help debug test failures."
2020-04-24 03:14:17 +00:00
Yan Yan
f2d50ece98 Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88
Change-Id: I3d2ee1aeba0c8473c71a41f3202da663707724f1
2020-04-24 00:39:39 +00:00
Yan Yan
b15c228d88 Merge "Add CTS for EapSessionConfig" am: c7afaba688
Change-Id: I51e89a5604d78c325a8a985b3144ae49734f9eb3
2020-04-24 00:25:31 +00:00
Yan Yan
c7afaba688 Merge "Add CTS for EapSessionConfig" 2020-04-24 00:00:43 +00:00
Yan Yan
8d5985e738 Merge "Create base class that sets up test network" am: c921e5075f am: a1c71f705b
Change-Id: I750675c3eafb2a28d554df163826b8ec86f03ca0
2020-04-23 22:52:51 +00:00
Yan Yan
1020e90c9a Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308 am: 755a4b59b7
Change-Id: I42e2ccd1d5a884d0992f3f75468904799d4f3ec6
2020-04-23 22:52:40 +00:00
Yan Yan
a1c71f705b Merge "Create base class that sets up test network" am: c921e5075f
Change-Id: Ib5f5fd2bc54ad5c4866622f74f1c1d555fee5592
2020-04-23 22:37:28 +00:00
Yan Yan
755a4b59b7 Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308
Change-Id: I8a268a878c089a98a1d9b73190ab0db6204b0746
2020-04-23 22:37:03 +00:00
Yan Yan
c921e5075f Merge "Create base class that sets up test network" 2020-04-23 22:19:21 +00:00
Yan Yan
dbe2adf308 Merge "Make a copy of TunUtils and PacketUtils" 2020-04-23 22:18:45 +00:00
Sudheer Shanka
d43f034725 Ensure location is enabled before getting SSID.
When location is disabled, Wi-Fi scan results and SSID are not available
to apps.

Fixes: 153850762
Fixes: 153396893
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I05285811d7131e116d5e1d072137ed2cf9576d05
Merged-In: I05285811d7131e116d5e1d072137ed2cf9576d05
2020-04-23 14:18:32 -07:00
Sudheer Shanka
004c442de9 Fix a regression in how required properties are collected.
+ Enable app standby mode before running the tests.

Fixes: 147459100
Fixes: 117169751
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: cts-tradefed run singleCommand cts-on-gsi --skip-device-info \
      --skip-preconditions -m CtsHostsideNetworkTests \
      -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: I782f8a06922622d28f9a9d5c9f2afa2b12f8aa80
Merged-In: I782f8a06922622d28f9a9d5c9f2afa2b12f8aa80
2020-04-23 14:18:32 -07:00
Sudheer Shanka
a0e71e89ea Fix Error Prone errors
Soong wasn't including android_app or android_test sources in the
javac-check target used for the Error Prone build, which allowed
some Error Prone errors to get in.  Fix them so Error Prone can be
re-enabled for these targets.

Fixes:
cts/hostsidetests/net/app/src/com/android/cts/net/hostside/RequiredPropertiesRule.java:61: error: [CollectionIncompatibleType] Argument '~requiredProperty.getValue()' should not be passed to this method; its type int is not compatible with its collection's type argument Property

Bug: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I7c5bf823bf371902285ce3ee3929796fa40c653b
Merged-In: I48b1ccb61c807d0b41a165298ef5981258d6656e
2020-04-23 14:18:32 -07:00
Sudheer Shanka
3cd28c2a39 Reland "Pull service dumps to help debug test failures."
+ Convert tests to use Junit4
+ Add annotations to specify required conditions for the test to run.

This reverts commit 89099548f8.

Bug: 137859686
Change-Id: I7bb2a7e4b2dca3696761e7c030f3380b9226b676
Merged-In: I93317c201a0ea06732e29154ab7e140735381f59
2020-04-23 14:18:32 -07:00
Sudheer Shanka
e3b1da9363 [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 am: 8d7f5f0f9a -s ours am: 03b91d2e5e -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I6752e843170f0c0447ffe42bb297180a4d0a8c75
2020-04-23 19:45:46 +00:00
Sudheer Shanka
03b91d2e5e [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 am: 8d7f5f0f9a -s ours
am skip reason: skipped by user sudheersai

Change-Id: I13d4668cb83890490a46ef63444ef6390d1e0e91
2020-04-23 19:33:11 +00:00
Sudheer Shanka
8d7f5f0f9a Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4
* changes:
  Ensure location is enabled before getting SSID.
  Fix a regression in how required properties are collected.
  Fix Error Prone errors
  Reland "Pull service dumps to help debug test failures."
2020-04-23 17:57:10 +00:00
evitayan
8cfc634bbc Create base class that sets up test network
This class will be extended by both IkeSessionParamsTest and
IkeSessionTestBase

Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: I98979758a7a684219e35c02ded93224ea172d44f
2020-04-23 10:40:49 -07:00
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
evitayan
8af9ca27a2 Make a copy of TunUtils and PacketUtils
Temporarily make copies. Eventually will statically include the
source files in CtsIkeTestCases

Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: I7dd5c8b849f0d987fa6d76bc5a0bc1a7eed49b0d
2020-04-23 00:58:44 -07: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
Sudheer Shanka
0ac91b4737 Ensure location is enabled before getting SSID.
When location is disabled, Wi-Fi scan results and SSID are not available
to apps.

Fixes: 153850762
Fixes: 153396893
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I05285811d7131e116d5e1d072137ed2cf9576d05
Merged-In: I05285811d7131e116d5e1d072137ed2cf9576d05
2020-04-22 14:37:45 -07:00
Sudheer Shanka
a6a1ad183e Fix a regression in how required properties are collected.
+ Enable app standby mode before running the tests.

Fixes: 147459100
Fixes: 117169751
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: cts-tradefed run singleCommand cts-on-gsi --skip-device-info \
      --skip-preconditions -m CtsHostsideNetworkTests \
      -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: I782f8a06922622d28f9a9d5c9f2afa2b12f8aa80
Merged-In: I782f8a06922622d28f9a9d5c9f2afa2b12f8aa80
2020-04-22 13:59:46 -07:00
Sudheer Shanka
39cc315273 Fix Error Prone errors
Soong wasn't including android_app or android_test sources in the
javac-check target used for the Error Prone build, which allowed
some Error Prone errors to get in.  Fix them so Error Prone can be
re-enabled for these targets.

Fixes:
cts/hostsidetests/net/app/src/com/android/cts/net/hostside/RequiredPropertiesRule.java:61: error: [CollectionIncompatibleType] Argument '~requiredProperty.getValue()' should not be passed to this method; its type int is not compatible with its collection's type argument Property

Bug: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I7c5bf823bf371902285ce3ee3929796fa40c653b
Merged-In: I48b1ccb61c807d0b41a165298ef5981258d6656e
2020-04-22 13:52:12 -07:00
Sudheer Shanka
1206400ccf Reland "Pull service dumps to help debug test failures."
+ Convert tests to use Junit4
+ Add annotations to specify required conditions for the test to run.

This reverts commit 89099548f8.

Bug: 137859686
Change-Id: I7bb2a7e4b2dca3696761e7c030f3380b9226b676
Merged-In: I93317c201a0ea06732e29154ab7e140735381f59
2020-04-22 12:27:50 -07: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