Commit Graph

4885 Commits

Author SHA1 Message Date
Yan Yan
eb91c68101 Merge "Add initial CTS test for IkeSessionParams" am: f839aaad8c am: 8a6bf04733 am: de5df252f6
Change-Id: I39bee883c3f8cc662bbafab1f6e050b368c97e8e
2020-04-25 02:32:02 +00:00
Yan Yan
de5df252f6 Merge "Add initial CTS test for IkeSessionParams" am: f839aaad8c am: 8a6bf04733
Change-Id: Ie36e8c51611b8886e3b3262ff4a368d7444daf5f
2020-04-25 02:19:53 +00:00
Yan Yan
8a6bf04733 Merge "Add initial CTS test for IkeSessionParams" am: f839aaad8c
Change-Id: Iaaa69b04d380b2ae3705e33472f7fb97b1a5cb24
2020-04-25 02:08:26 +00:00
Yan Yan
f839aaad8c Merge "Add initial CTS test for IkeSessionParams" 2020-04-25 01:53:15 +00:00
Automerger Merge Worker
2a55d3c9a8 Merge changes from topic "am-9dc7ccb81d8e485c895d2a6dfab067cc" into rvc-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 am: d1fd7784bc -s ours
  [automerger skipped] Test legacy tether/untether API and onError callback am: a6b3b70278 am: eb970903c9 -s ours
2020-04-25 01:26:40 +00:00
Mark Chien
0524daa546 [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 am: d1fd7784bc -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history

Change-Id: I901494f8d6fdf02e613873e131c36376f2ca4774
2020-04-25 01:26:34 +00:00
markchien
d8da41b6bc [automerger skipped] Test legacy tether/untether API and onError callback am: a6b3b70278 am: eb970903c9 -s ours
am skip reason: Change-Id Ifb3a0618208ffd0ff224c60f377036bc22ba0565 with SHA-1 1a54afc5b1 is in history

Change-Id: Iea0ae12e6cd4f63b57b02772f405b98548e91823
2020-04-25 01:26:31 +00:00
Mark Chien
bab8f69488 [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 -s ours am: 1f03fbdeed -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history

Change-Id: I7fa7ffe6918ba67994e6012530edc6fe2a75432f
2020-04-25 01:26:26 +00:00
Mark Chien
d1fd7784bc Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277
Change-Id: Id6a5aafaf2dc04f114d4d89d43446f7bc959c19f
2020-04-25 01:11:25 +00:00
markchien
eb970903c9 Test legacy tether/untether API and onError callback am: a6b3b70278
Change-Id: Ib03358cf9a1b6cdee5e67535d4a6ab45d95e609d
2020-04-25 01:11:22 +00:00
Mark Chien
1f03fbdeed [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history

Change-Id: I7ba9696e197b4c53b7031f3d7d380b44c66cfbac
2020-04-25 01:10:39 +00:00
evitayan
b9438336c7 Add initial CTS test for IkeSessionParams
This commit adds tests for building IkeSessionParams with PSK. It
also tests configuring SA lifetimes, retransmissions and PCSCF
server requests

Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: I16fdc1ff9a22acb82b376211e0f187c4ead4cae5
2020-04-24 10:30:30 -07:00
Treehugger Robot
f0d7968e23 Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0 am: 91d915e116 am: 482dda22da
Change-Id: I55e4cad38245be997a410dc9a3786595abd10676
2020-04-24 16:15:26 +00:00
Treehugger Robot
9a30944d71 Merge "Test legacy tether/untether API and onError callback" am: c31694df4c am: b8e44e87b3 am: 22da660983
Change-Id: Ifd3822afc77f71960fc8c72053170c84775279d5
2020-04-24 16:14:34 +00:00
Treehugger Robot
482dda22da Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0 am: 91d915e116
Change-Id: I3aa5fadfb7b417730d53c8976f425e3c229e9918
2020-04-24 16:01:23 +00:00
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
91d915e116 Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0
Change-Id: Ib8ca2e9a3dca0494af62e193f261bf4a943d3028
2020-04-24 15:44:51 +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
6aa8f074d0 Merge "Add testTetheringUpstream cts test" 2020-04-24 15:36:21 +00:00
Treehugger Robot
c31694df4c Merge "Test legacy tether/untether API and onError callback" 2020-04-24 15:29:44 +00:00
markchien
668dfa5998 Add testTetheringUpstream cts test
If cellular is the mobile network, tethering should select it as
upstream. If DUN is required, tethering should use DUN as its upstream.

Bug: 153614366
Bug: 150644305
Test: atest CtsTetheringTest

Change-Id: Ief9c745322e8705c0e50185e749a81c5a9d20743
Merged-In: Ief9c745322e8705c0e50185e749a81c5a9d20743
2020-04-24 22:31:01 +08:00
markchien
0420e692a7 Add testTetheringUpstream cts test
If cellular is the mobile network, tethering should select it as
upstream. If DUN is required, tethering should use DUN as its upstream.

Bug: 153614366
Bug: 150644305
Test: atest CtsTetheringTest

Change-Id: Ief9c745322e8705c0e50185e749a81c5a9d20743
2020-04-24 22:29:43 +08:00
markchien
a6b3b70278 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
Merged-In: Ifb3a0618208ffd0ff224c60f377036bc22ba0565
2020-04-24 22:23:23 +08: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
8340720e76 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours am: 38bd84d94e -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: I656462f68b3fba1eefdd61ddff1ca4faec05212f
2020-04-24 06:42:28 +00:00
TreeHugger Robot
4201ba3fa3 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e am: 2eed6ea182 -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: If2e49d8251036dba4decffc2c1631a7171334c95
2020-04-24 06:42:05 +00:00
TreeHugger Robot
2eed6ea182 Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e
Change-Id: I68240e77ac0e8a6328cfc92f0a5cd844129ae316
2020-04-24 06:27:50 +00: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
8451b7d01c [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours am: f5af3d7527 -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: Ie16e6a712f34ed9f9c30d2c8d0ff4bd49f48a54b
2020-04-24 03:29:05 +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
986cf9af4e Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88 am: f2d50ece98
Change-Id: Ida96e4a0dd074a288b1b44defd18097370d618dc
2020-04-24 00:42:06 +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
89a9fa945e Merge "Create base class that sets up test network" am: c921e5075f am: a1c71f705b am: 8d5985e738
Change-Id: I3d2f6217cad6915e7d8338d1fd5809c0be2598cf
2020-04-23 23:04:56 +00:00
Yan Yan
ce75b8aba4 Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308 am: 755a4b59b7 am: 1020e90c9a
Change-Id: Ie91b4f41f3a73c9e4ac82980dcbfd87e05b99350
2020-04-23 23:04:23 +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
1802c8b1de [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 am: 8d7f5f0f9a -s ours am: 03b91d2e5e -s ours am: e3b1da9363 -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I08fe715f097b43dc899182c6be99e3fb5e2fb512
2020-04-23 20:00:26 +00: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