Bill Rassieur
4fee086ebb
Merge master@5428150 into git_qt-dev-plus-aosp.
...
Change-Id: Icd07411ce45f7aa4f6bd284a6260f19e28781ac6
BUG: 129345239
2019-04-02 18:26:52 +00:00
Junyu Lai
52c4286d77
Merge "Fix tests in TrafficStatsTest that are affected by adb over network" am: 553872fc04 am: 1e68a61016
...
am: ec75966da1
Change-Id: Iada21760551959e96210bf2f1807f24bc6d82be7
2019-04-01 20:08:12 -07:00
Junyu Lai
ec75966da1
Merge "Fix tests in TrafficStatsTest that are affected by adb over network" am: 553872fc04
...
am: 1e68a61016
Change-Id: I3ca1e795546d9991f7c0a10d98cd9c6abd929ff4
2019-04-01 19:37:54 -07:00
Junyu Lai
1e68a61016
Merge "Fix tests in TrafficStatsTest that are affected by adb over network"
...
am: 553872fc04
Change-Id: I8a001fe185788d5e2a9ceb8ce11162be3b80912e
2019-04-01 19:23:05 -07:00
Junyu Lai
553872fc04
Merge "Fix tests in TrafficStatsTest that are affected by adb over network"
2019-04-02 02:00:25 +00:00
Roshan Pius
52b26e2cab
Merge "WifiManagerTest: Test for new privileged permission"
2019-04-01 19:57:11 +00:00
Lorenzo Colitti
f0d0a9e352
Merge "Add test coverage for ICMP echo constants." am: 718025ed2c am: 0f6be092bb
...
am: b452497881
Change-Id: Ic0189e07e2745b721a307754a7bcc6574878ac32
2019-04-01 09:11:18 -07:00
Lorenzo Colitti
b452497881
Merge "Add test coverage for ICMP echo constants." am: 718025ed2c
...
am: 0f6be092bb
Change-Id: I337e4723ed1af668067148a479b9b21f9f29c330
2019-04-01 08:41:45 -07:00
Lorenzo Colitti
0f6be092bb
Merge "Add test coverage for ICMP echo constants."
...
am: 718025ed2c
Change-Id: I998c14bc1ef65582b0a6715f8307c910c90f9c9b
2019-04-01 08:30:12 -07:00
Lorenzo Colitti
718025ed2c
Merge "Add test coverage for ICMP echo constants."
2019-04-01 15:08:44 +00:00
junyulai
c1419d913d
Fix tests in TrafficStatsTest that are affected by adb over network
...
If the adb TCP port is opened, this test may be run by adb over
network. Huge amount of data traffic might go through the
network and accounted into total packets stats. The upper bound
check would be meaningless.
Bug: 126320702
Test: atest android.net.cts.TrafficStatsTest 10 trials for both cases
Change-Id: Iaee455826dc01741c6a3a9f5f8096361c69a1e7c
2019-04-01 11:12:16 +08:00
Brio Automation
93dca81d5f
Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: 8e3bef2416 -s ours am: baed35fda0 -s ours am: da646b71ee -s ours
...
am: e7ae8c5c48 -s ours
am skip reason: subject contains skip directive
Change-Id: I0f5dd20baf05bad8eabb37a187ca1b48f3c2cab4
2019-03-29 17:31:31 -07:00
Brio Automation
83c0e14c0b
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: 8e3bef2416 -s ours am: 7ac21f4f1d
...
am: 19ae160653 -s ours
am skip reason: subject contains skip directive
Change-Id: I0d74bcaa2bc7dc5723b32df29859ffd644ff8abf
2019-03-29 16:49:10 -07:00
Brio Automation
e7ae8c5c48
Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: 8e3bef2416 -s ours am: baed35fda0 -s ours
...
am: da646b71ee -s ours
am skip reason: subject contains skip directive
Change-Id: I4e69fd386d7bd80208948560a3fdc2c9e170d26c
2019-03-29 16:35:48 -07:00
Brio Automation
19ae160653
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: 8e3bef2416 -s ours
...
am: 7ac21f4f1d
Change-Id: I9cb2098d1bd8538a26ff1dcba10534c63a405baa
2019-03-29 16:12:20 -07:00
Brio Automation
da646b71ee
Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: 8e3bef2416 -s ours
...
am: baed35fda0 -s ours
am skip reason: subject contains skip directive
Change-Id: I297d19f37819dd47be9e64dd9b2a0e2e07c72e95
2019-03-29 15:59:53 -07:00
Brio Automation
7ac21f4f1d
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours
...
am: 8e3bef2416 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie2c0ba80b48639562e56fd6fc92944b514a696f1
2019-03-29 15:32:51 -07:00
Android Merger
baed35fda0
Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: 8e3bef2416 -s ours am skip reason: subject contains skip directive"
2019-03-29 22:06:24 +00:00
Brio Automation
1696a4377d
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours
...
am: 8e3bef2416 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifce3b82c92d75daccfe655a0ff70ef3f121766d5
2019-03-29 15:06:03 -07:00
Android Merger
8e3bef2416
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am skip reason: subject contains skip directive" into pie-cts-dev
2019-03-29 21:55:49 +00:00
Brio Automation
8d7997ef50
[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev
...
am: af988f0d74 -s ours
am skip reason: subject contains skip directive
Change-Id: I572f99c9dadc432b15c21da7658fe4d2cc5596b2
2019-03-29 14:55:40 -07:00
Roshan Pius
478f45e36d
WifiManagerTest: Test for new privileged permission
...
Add a new test to ensure that the NETWORK_CARRIER_PROVISIONING is only
granted to one app.
Bug: 129401919
Test: atest WifiManagerTest
Change-Id: Id2e722d63b02d9cee718dd3af49e9ef113bd5ffb
2019-03-29 12:36:38 -07:00
Lorenzo Colitti
950e10572b
Add test coverage for ICMP echo constants.
...
Bug: 129251251
Test: atest android.net.ipv6.cts.PingTest com.android.cts.net.HostsideVpnTests
Change-Id: Icca18e0870588ca250225ce79cf30dbd8c361e84
2019-03-30 02:11:46 +09:00
Lorenzo Colitti
a7fc792b84
Merge "Add more test for async DNS api" am: 3592095637 am: 05a8151676
...
am: 4e95f73af9
Change-Id: If53503449da4687d8740485aa80e2a79f2ef4ad2
2019-03-29 08:30:47 -07:00
Lorenzo Colitti
4e95f73af9
Merge "Add more test for async DNS api" am: 3592095637
...
am: 05a8151676
Change-Id: If7168bd2f88e2ea643edaa2c83d6bcf7ea3776c2
2019-03-29 08:17:44 -07:00
Lorenzo Colitti
05a8151676
Merge "Add more test for async DNS api"
...
am: 3592095637
Change-Id: I6e8f5c9561895234eb7991d8cd6836a53d8095d7
2019-03-29 08:04:52 -07:00
Lorenzo Colitti
3592095637
Merge "Add more test for async DNS api"
2019-03-29 14:46:11 +00:00
Luke Huang
8fd0506401
Add more test for async DNS api
...
Bug: 129395490
Test: atest DnsResolverTest
Change-Id: I4d2cdc2be577846c08dfe994da60965f983acb97
2019-03-29 17:09:57 +08:00
Bill Rassieur
e2fd217b4c
Merge master@5406228 into git_qt-dev-plus-aosp.
...
Change-Id: Ica3ed775529085371f0ed17944a420feea1c197d
BUG: 129345239
2019-03-29 04:13:36 +00:00
Luke Huang
e36443f4b0
Merge "Improve cancellation test for async DNS API" am: 7ac8a1e73e am: 532f7a7875
...
am: 4da94c3c61
Change-Id: Iffb26abf97bbcba814ffc6105831aad4667a2aa0
2019-03-28 21:11:44 -07:00
Luke Huang
4da94c3c61
Merge "Improve cancellation test for async DNS API" am: 7ac8a1e73e
...
am: 532f7a7875
Change-Id: I495232e8e098ff59b1ffd268a1c0642ec5313e94
2019-03-28 20:40:11 -07:00
Luke Huang
532f7a7875
Merge "Improve cancellation test for async DNS API"
...
am: 7ac8a1e73e
Change-Id: I65b100abd79e52b20ea81d8e0049b910a761e78b
2019-03-28 20:28:23 -07:00
Luke Huang
92f1edd2f0
Improve cancellation test for async DNS API
...
After having a lock between callback and cancellationsignal,
errno with EBADF should not happen.
Bug: 129317069
Test: atest DnsResolverTest
Change-Id: I08e800b078d40345eb3f46da1323db251c8dcd47
2019-03-28 21:06:30 +08:00
Lorenzo Colitti
bcc22abe3d
Merge "Fix expected reverse lookup of Google DNS IP addresses" am: 38ca09669a am: d73366ae68
...
am: 86effc29ba
Change-Id: Ia5b898185b77aceeb2e3a5fbdd168d3f470fa056
2019-03-28 03:20:35 -07:00
Lorenzo Colitti
86effc29ba
Merge "Fix expected reverse lookup of Google DNS IP addresses" am: 38ca09669a
...
am: d73366ae68
Change-Id: I42abf8822257c3ded99e6d7ab470ba78ecf75cc7
2019-03-28 03:07:26 -07:00
Lorenzo Colitti
d73366ae68
Merge "Fix expected reverse lookup of Google DNS IP addresses"
...
am: 38ca09669a
Change-Id: I274ce56ff0fda4e980c748f211926c6b69a92f35
2019-03-28 02:58:41 -07:00
Lorenzo Colitti
38ca09669a
Merge "Fix expected reverse lookup of Google DNS IP addresses"
2019-03-28 09:49:22 +00:00
Lorenzo Colitti
3852fd92f5
Fix expected reverse lookup of Google DNS IP addresses
...
DnsTest.testDnsWorks expects that reverse lookup for the Google
public DNS servers will return something with google.com in the
name. This no longer works because the reverse DNS entries have
changed to dns.google.
Bug: 129452237
Test: atest android.net.cts.DnsTest.testDnsWorks
Change-Id: Iee8bfe418bf6003e5c78df77d75f6f9745249267
2019-03-28 17:41:13 +09:00
Brio Automation
ec3594edb1
[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: ebd34afef5 -s ours am: 63bfe51c2d
...
am: dc28b7d29d -s ours
am skip reason: subject contains skip directive
Change-Id: I6c9e80eb2b2a697d159c8a793b768b55ebf1ac44
2019-03-27 01:19:18 -07:00
Brett Chabot
70ff07df60
[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pi-dev am: c582672ed4 -s ours
...
am: 0a214597fb -s ours
am skip reason: subject contains skip directive
Change-Id: I55f02cf5f8bec1d2e2bbb755d00619623c4653e5
2019-03-27 01:17:41 -07:00
Brio Automation
dc28b7d29d
[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: ebd34afef5 -s ours
...
am: 63bfe51c2d
Change-Id: Ic5a6158f2a3b424f586b579f671dc7288d19fbb0
2019-03-27 01:08:21 -07:00
Brett Chabot
0a214597fb
[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pi-dev
...
am: c582672ed4 -s ours
am skip reason: SHA1 c582672ed4 skipped by user brettchabot
Change-Id: Ifd6844b4330dbc5e55fd813fa9b2ed3c48ec467f
2019-03-27 00:52:58 -07:00
Luke Huang
c8bc339f5f
Merge "Improve test and fix doulbe-close fd problem for async DNS API cts" am: 277181d9d3 am: af31d7737c
...
am: db34a5d62e
Change-Id: If254f96b9706913a9a3b8970ccd1264225467bb0
2019-03-26 23:06:33 -07:00
Luke Huang
db34a5d62e
Merge "Improve test and fix doulbe-close fd problem for async DNS API cts" am: 277181d9d3
...
am: af31d7737c
Change-Id: Ifda2107b18e1dad6cef227f440bb3cf10a401e15
2019-03-26 22:57:22 -07:00
Luke Huang
af31d7737c
Merge "Improve test and fix doulbe-close fd problem for async DNS API cts"
...
am: 277181d9d3
Change-Id: I07649e4fcb899a9f82043a3bb9665446a8ae98a9
2019-03-26 22:49:36 -07:00
Brio Automation
63bfe51c2d
[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours
...
am: ebd34afef5 -s ours
am skip reason: subject contains skip directive
Change-Id: I119d7e01ee076867498ddfb9b33800eb07694126
2019-03-26 17:57:23 -07:00
Brio Automation
ebd34afef5
[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev
...
am: af988f0d74 -s ours
am skip reason: subject contains skip directive
Change-Id: I3a482f4e516c0e9e417537478bc155925f0a0ea6
2019-03-26 17:48:22 -07:00
Luke Huang
acadb939b5
Improve test and fix doulbe-close fd problem for async DNS API cts
...
1. Change test cases for enlarging buffer size of FrameworkListener.
2. Remove test procedure which caused doulbe-close fd.
Bug: 129317069
Bug: 126307309
Test: atest CtsNativeNetDnsTestCases MultinetworkApiTest
Change-Id: I8d871cebca6fa7e298a874ba430ec0aaa05c0eed
2019-03-26 20:33:43 +08:00
Brio Automation
b84038696c
RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1
...
https://android-review.googlesource.com/c/platform/cts/+/833600
Change-Id: Id6f986aacc3cadf713ebbc8305ca535b861390fc
Bug: 119382723
2019-03-26 00:31:14 +00:00
Ahmed ElArabawy
329a65aeec
Merge "Wifi: Rename class name WifiManager_WifiLockTest"
2019-03-25 21:22:48 +00:00