Commit Graph

3388 Commits

Author SHA1 Message Date
Pete Bentley
cf8f97b3b7 Merge "Fix regression tests for SSLCertificateSocketFactoryTest hostname verification." am: 62ec101de4 am: 503cbe8f8c
am: 465611b72f

Change-Id: Ifef002dd13da5712c8a8c4d22388cc25ecc54709
2019-06-25 08:17:25 -07:00
Pete Bentley
465611b72f Merge "Fix regression tests for SSLCertificateSocketFactoryTest hostname verification." am: 62ec101de4
am: 503cbe8f8c

Change-Id: I98414de38201df779c27a37efbb73a153b09b0d6
2019-06-25 08:02:24 -07:00
Pete Bentley
62ec101de4 Merge "Fix regression tests for SSLCertificateSocketFactoryTest hostname verification." 2019-06-25 14:13:43 +00:00
Julien Desprez
5cab049c08 Merge "[Cherry pick] Mark module as "secondary_user" since it uncovered bug before" am: 9c9dde65ba am: d30bab3710
am: 7b48d84ed5

Change-Id: I196ad1e84d97a5593ae768aeb74915a40894fb99
2019-06-25 01:08:45 -07:00
Julien Desprez
7b48d84ed5 Merge "[Cherry pick] Mark module as "secondary_user" since it uncovered bug before" am: 9c9dde65ba
am: d30bab3710

Change-Id: I86f7186964eb9dd70cd7b442768095fc806afb7a
2019-06-25 01:00:59 -07:00
Julien Desprez
14fae15d0a [Cherry pick] Mark module as "secondary_user" since it uncovered bug before
This will allow running this module against a secondary
user in continuous infra to uncover bugs.

Test: run cts-unit-tests
Bug: 130892086
Change-Id: I063a0d29163567ec2cf97d2e4469e88e7203e852
Merged-In: Ic8af2e3e77e24db340b2894c2d36e3501962952c
2019-06-24 09:15:51 -07:00
Pete Bentley
331856df7d Fix regression tests for SSLCertificateSocketFactoryTest hostname verification.
No longer relies on a server with a known bad TLS certificate, instead
connects to a known good server but installs a HostnameVerifier which
rejects all hostnames in order to test that verification is taking place
where expected.

Bug: 2807618
Bug: 134532880
Test: atest CtsNetTestCases
Test: atest CtsNetTestCases --instant
Change-Id: I7608047a75555296153459a45747ee83ec87db4b
2019-06-24 15:27:42 +01:00
Pete Bentley
029d004113 Merge "Update test host used for TLS host verification." am: 29ec721673 am: 776e73a67c
am: 48849843db

Change-Id: I9cced1f2636ac8009d99dac901c899ec918cd6ab
2019-06-20 10:40:24 -07:00
Pete Bentley
48849843db Merge "Update test host used for TLS host verification." am: 29ec721673
am: 776e73a67c

Change-Id: Icfeb40d166addc1827cc6f3823888c2bdaa012dd
2019-06-20 10:00:26 -07:00
Pete Bentley
29ec721673 Merge "Update test host used for TLS host verification." 2019-06-20 12:27:27 +00:00
Junyu Lai
3e70f8181a [automerger skipped] Add CTS for creating keepalive offloads on cellular am: 2419976be4 -s ours
am: ef3b6d4640 -s ours
am skip reason: change_id Ia7b1111abe687efad032a8c9205990c97a769fcd with SHA1 487b0401c0 is in history

Change-Id: Iad6b89c9d5e6fd30fcefbabe923b49e5f821dd09
2019-06-19 23:17:37 -07:00
Junyu Lai
ef3b6d4640 [automerger skipped] Add CTS for creating keepalive offloads on cellular
am: 2419976be4 -s ours
am skip reason: change_id Ia7b1111abe687efad032a8c9205990c97a769fcd with SHA1 487b0401c0 is in history

Change-Id: I13acb44663576e3237646877bb1f71e0d48c6914
2019-06-19 22:51:58 -07:00
Junyu Lai
2419976be4 Add CTS for creating keepalive offloads on cellular
Bug: 134352656
Test: atest android.net.cts.ConnectivityManagerTest (--instant)
Merged-In: Ia7b1111abe687efad032a8c9205990c97a769fcd
Change-Id: Ib6b01356d785c5b7684520eef9f9d1fe48187582
(cherry picked from commit 8550488c7cf0c0ab2af06189aca5ad50c39e5276)
2019-06-20 02:22:23 +00:00
Sudheer Shanka
bf80eece94 [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92 am: 14586e59ae -s ours am: aa42c35fac -s ours
am: f491acd9df -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: I7c52fe72414d9ab7887b5be0b142830a3002f7fc
2019-06-19 12:32:51 -07:00
Sudheer Shanka
036c26ee3d [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92 am: 14586e59ae -s ours am: aa42c35fac -s ours
am: 7ea6de2788 -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: I1adea7d4a1e2f853989647add70b81c1b83f5018
2019-06-19 12:20:42 -07:00
Sudheer Shanka
f491acd9df [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92 am: 14586e59ae -s ours
am: aa42c35fac -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: I88f0609f13b01ebd0bb63febc024139df28b8512
2019-06-19 12:09:55 -07:00
Sudheer Shanka
aa42c35fac [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92
am: 14586e59ae -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: Ifb8f628a98a57a5845c476f29775b1bc4ec5a31a
2019-06-19 11:58:29 -07:00
Sudheer Shanka
14586e59ae Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev
am: e3c9363b92

Change-Id: Ib587d87add52de4d2e076876edbae7c519eb70ab
2019-06-19 11:44:23 -07:00
Junyu Lai
aeef4e5efa Merge "Add CTS for creating keepalive offloads on cellular" am: 16174b2cff am: e849a96874
am: eb76123add

Change-Id: Ie7d49cbaa2c233ae075e31734c70e24bed9a2633
2019-06-19 07:36:36 -07:00
Junyu Lai
eb76123add Merge "Add CTS for creating keepalive offloads on cellular" am: 16174b2cff
am: e849a96874

Change-Id: Ib6b01356d785c5b7684520eef9f9d1fe48187582
2019-06-19 07:29:02 -07:00
Junyu Lai
16174b2cff Merge "Add CTS for creating keepalive offloads on cellular" 2019-06-19 14:08:31 +00:00
junyulai
487b0401c0 Add CTS for creating keepalive offloads on cellular
Bug: 134352656
Test: atest android.net.cts.ConnectivityManagerTest (--instant)
Change-Id: Ia7b1111abe687efad032a8c9205990c97a769fcd
2019-06-19 10:10:21 +08:00
Sudheer Shanka
d718d35ee1 Merge "Skip battery saver related tests on unsupported devices." into qt-dev am: f8eb2722ff
am: b357138cb6

Change-Id: I21dff5accd2dfaf34ba5c68382e4bb10a3818ed9
2019-06-14 10:48:38 -07:00
Sudheer Shanka
9677c19c12 Merge "Skip battery saver related tests on unsupported devices." into qt-dev am: f8eb2722ff
am: bec485ec90

Change-Id: I4423117a8636ce63431873f4f5edf0fe2832f97e
2019-06-14 10:46:35 -07:00
Sudheer Shanka
b357138cb6 Merge "Skip battery saver related tests on unsupported devices." into qt-dev
am: f8eb2722ff

Change-Id: Ibc940cd7806bada010838ea09989fa1a1c05233b
2019-06-14 10:35:32 -07:00
Sudheer Shanka
f8eb2722ff Merge "Skip battery saver related tests on unsupported devices." into qt-dev 2019-06-14 17:07:39 +00:00
Android Build Merger (Role)
655a9ba232 Merge changes from topic "am-a206f967153f49f0b7bd956a1d464b13" into qt-r1-dev-plus-aosp
* changes:
  Add test with inline executor for DnsResolverTest am: 5e43421294 am: a3a80dd035
  Fix DnsResolverTest for instant mode am: d3b7dec473 am: c80f4f2637
2019-06-13 07:27:27 +00:00
Luke Huang
fb64afc666 Add test with inline executor for DnsResolverTest am: 5e43421294
am: 14e0c7f182

Change-Id: Icd70b72c370cbca6c743e161739089f3dd82f1f6
2019-06-13 00:26:47 -07:00
Luke Huang
0caf75f2bc Add test with inline executor for DnsResolverTest am: 5e43421294
am: a3a80dd035

Change-Id: I754d08a1890f7ced6b85de40f43d071891a41d20
2019-06-13 00:26:44 -07:00
Luke Huang
1ec3b22e48 Fix DnsResolverTest for instant mode am: d3b7dec473
am: d6ff2603c3

Change-Id: I2fda2fe7d085d36379b339ceecee3b0d7aee8d13
2019-06-13 00:26:44 -07:00
Luke Huang
1be9f6dd1a Fix DnsResolverTest for instant mode am: d3b7dec473
am: c80f4f2637

Change-Id: I929f917862b9027dcedf82ea95b516e49f992373
2019-06-13 00:26:41 -07:00
Luke Huang
a3a80dd035 Add test with inline executor for DnsResolverTest
am: 5e43421294

Change-Id: I3f1c81acb525e1e4afc71f420ff3940015e0f271
2019-06-13 00:21:44 -07:00
Luke Huang
c80f4f2637 Fix DnsResolverTest for instant mode
am: d3b7dec473

Change-Id: I2117d9830a4a285c78ad3732d3f327a5285ad98f
2019-06-13 00:21:41 -07:00
Luke Huang
5e43421294 Add test with inline executor for DnsResolverTest
Makes general query test cases also take inline executor.
The new added test case testSequentialQuery with inline executor
will only pass after aosp/980686.

Bug: 134310704
Test: atest DnsResolverTest
      atest DnsResolverTest --instant
Change-Id: I135358fe45652277ed795a2f359f44f4db787c08
(cherry picked from commit 04596294eea3e5db4fd487cf6f8ef598daac606a)
2019-06-13 11:24:48 +08:00
Luke Huang
d3b7dec473 Fix DnsResolverTest for instant mode
add AppModeFull@ to DnsResolverTest since WRITE_SECURE_SETTINGS
could not be ganted in instant mode.

Bug: 134897744
Test: atest DnsResolverTest
      atest DnsResolverTest --instant

Change-Id: I267c19af1a1c5544ca752a364335ec728a478bb2
(cherry picked from commit 2af244f4127883ed967089f550f2cfe07936416d)
2019-06-13 11:24:25 +08:00
Luke Huang
92e1bf6be7 Merge changes I135358fe,I267c19af am: 1d98d5933f am: e16be254bc
am: 0d52a1f229

Change-Id: I92c93b98db1bcd42e04398f1a603607372092a83
2019-06-12 14:41:52 -07:00
Luke Huang
0d52a1f229 Merge changes I135358fe,I267c19af am: 1d98d5933f
am: e16be254bc

Change-Id: I8761fd94e51395140a51d8c8a7f541cdfd2de165
2019-06-12 14:21:59 -07:00
Luke Huang
1053db1f82 Add test with inline executor for DnsResolverTest
Makes general query test cases also take inline executor.
The new added test case testSequentialQuery with inline executor
will only pass after aosp/980686.

Bug: 134310704
Test: atest DnsResolverTest
      atest DnsResolverTest --instant
Change-Id: I135358fe45652277ed795a2f359f44f4db787c08
2019-06-13 01:18:37 +08:00
Luke Huang
c80f04858e Fix DnsResolverTest for instant mode
add AppModeFull@ to DnsResolverTest since WRITE_SECURE_SETTINGS
could not be ganted in instant mode.

Bug: 134897744
Test: atest DnsResolverTest
      atest DnsResolverTest --instant

Change-Id: I267c19af1a1c5544ca752a364335ec728a478bb2
2019-06-13 00:46:18 +08:00
Android Build Merger (Role)
6b6bf24878 Merge "Merge "Update test host used for TLS host verification." into qt-dev am: 0db9c1e7f3 am: 13964c8ae9" into qt-r1-dev-plus-aosp 2019-06-10 08:51:54 +00:00
Pete Bentley
23ff89b36b Merge "Update test host used for TLS host verification." into qt-dev am: 0db9c1e7f3
am: 13964c8ae9

Change-Id: I09d549cb7eb0b86056168be657b622da32bbbdab
2019-06-10 01:51:29 -07:00
Pete Bentley
8a42d78350 Merge "Update test host used for TLS host verification." into qt-dev am: 0db9c1e7f3
am: 7f799aae8e

Change-Id: Ie308b5dc678dba1c84b779f5a729947dc35cc894
2019-06-10 01:51:27 -07:00
Pete Bentley
7f799aae8e Merge "Update test host used for TLS host verification." into qt-dev
am: 0db9c1e7f3

Change-Id: I71c976d7287cea99d64ff8bace7a7ce0efef955c
2019-06-10 01:46:29 -07:00
Pete Bentley
50795d03cd Update test host used for TLS host verification.
Temporary fix, this is still brittle to certificate changes
on the test host.

Bug: 134532880
Test: atest android.net.cts.SSLCertificateSocketFactoryTest
Change-Id: I6e8c8757963ef46009767925bfa512127d9daba7
Merged-In: I6e8c8757963ef46009767925bfa512127d9daba7
(cherry picked from commit 166e7121b173f2a4e3d6a9ded213e4c8679a9cfb)
2019-06-07 19:01:51 +01:00
Pete Bentley
8eeaa698c6 Update test host used for TLS host verification.
Temporary fix, this is still brittle to certificate changes
on the test host.

Bug: 134532880
Test: atest android.net.cts.SSLCertificateSocketFactoryTest
Change-Id: I6e8c8757963ef46009767925bfa512127d9daba7
2019-06-07 18:41:48 +01:00
Sudheer Shanka
8371c77499 Skip battery saver related tests on unsupported devices.
Bug: 133761301
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ifec84425febf38d732367fae6b43fa80c427c79f
Merged-In: Ifec84425febf38d732367fae6b43fa80c427c79f
2019-06-07 10:16:07 -07:00
Sudheer Shanka
802549c8de Skip battery saver related tests on unsupported devices.
Bug: 133761301
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ifec84425febf38d732367fae6b43fa80c427c79f
2019-06-07 10:14:08 -07:00
Tomasz Wasilczyk
279b0c6726 Merge "Fix testNetworkSettingsPermission for headless User 0" into qt-dev am: e49034996e
am: 34d56ee82c

Change-Id: I4804c913b304d04e286f53adaa359819abae60db
2019-06-05 11:58:09 -07:00
Tomasz Wasilczyk
34d56ee82c Merge "Fix testNetworkSettingsPermission for headless User 0" into qt-dev
am: e49034996e

Change-Id: I6a89c5d7dacb80558ee0d635b7845c791b939ace
2019-06-05 11:52:09 -07:00
TreeHugger Robot
e49034996e Merge "Fix testNetworkSettingsPermission for headless User 0" into qt-dev 2019-06-05 18:40:35 +00:00