Owain Davies
a3cbe02799
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev am: 48216c2 am: 275a0e6 am: 4be27c8 am: 0399523 am: fd3f832 am: c403c81
...
am: b03bd92
* commit 'b03bd921b5d846312a67dc5f304d4ebc544bccbc':
Add assertion message if testDns ipv6 lookup reutrns ipv4.
Change-Id: Ifd7b42a72bc8c121ff433600efa484d2c7c57b9d
2016-04-25 23:55:20 +00:00
Owain Davies
fd9b2aacc6
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1 am: 2a0f366 am: 39cb9a5 am: 7cde9a8 am: 6d3841c
...
am: 59c1898
* commit '59c189830e2be88486ecbfcd3a2939852fb82e37':
Added assertion message to testDns failures
Change-Id: I2291f8204ae97521068fb65dffa6bd8d657ad2a9
2016-04-25 23:55:19 +00:00
Owain Davies
c403c81218
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev am: 48216c2 am: 275a0e6 am: 4be27c8 am: 0399523
...
am: fd3f832
* commit 'fd3f832fcfb9dc4fa3e4d497a97ebdf1636269b2':
Add assertion message if testDns ipv6 lookup reutrns ipv4.
Change-Id: I774f8188a4329508bd590564859f38b3ec049f7c
2016-04-25 23:48:09 +00:00
Owain Davies
6d3841c6a5
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1 am: 2a0f366 am: 39cb9a5
...
am: 7cde9a8
* commit '7cde9a81f8ee813b47dd424cea85692fd6f794fb':
Added assertion message to testDns failures
Change-Id: Icef1c18274c8ae3883b718d823f851d4c1562417
2016-04-25 23:48:07 +00:00
Owain Davies
03995235ba
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev am: 48216c2 am: 275a0e6
...
am: 4be27c8
* commit '4be27c8e8497987720d58494a330484648e72caa':
Add assertion message if testDns ipv6 lookup reutrns ipv4.
Change-Id: I03a0a86365929a6bdc8eb2815229341eb7a6a311
2016-04-23 06:19:47 +00:00
Owain Davies
39cb9a5a5c
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1
...
am: 2a0f366
* commit '2a0f3660e12cdbaa8f573811d82f07ebd9a8ed51':
Added assertion message to testDns failures
Change-Id: I36b06607bea7de4f032daa1ddc84d988d6d44399
2016-04-23 06:19:46 +00:00
Owain Davies
275a0e6237
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev
...
am: 48216c2
2016-04-23 06:13:45 +00:00
Owain Davies
2bfd0e1192
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev
...
am: 936375b
2016-04-23 06:13:44 +00:00
Android Merger
48216c2807
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev
2016-04-23 06:07:51 +00:00
Android Merger
936375b6f2
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev
2016-04-23 06:07:42 +00:00
Owain Davies
4455109378
Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev
...
am: b996de8
2016-04-23 06:07:33 +00:00
Owain Davies
7db24c68cf
Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev
...
am: 350b2aa
* commit '350b2aae5bc303d094a540c12bcb650a8bf5e139':
Added assertion message to testDns failures
Change-Id: I347197b0db859e3875b14701424d2d55d9059d32
2016-04-23 06:07:31 +00:00
Daniel Xie
b996de81cd
Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev
2016-04-23 06:02:23 +00:00
Android Build Merger (Role)
f47334ea4f
Merge "Merge "Rewrite X509TrustManagerExtensionsTest" into nyc-dev am: 1f8d6e8659 am: 75848bd16d" into nyc-mr1-dev-plus-aosp
2016-04-22 15:52:03 +00:00
Chad Brubaker
c1169f27b9
Merge "Rewrite X509TrustManagerExtensionsTest" into nyc-dev am: 1f8d6e8659
...
am: 75848bd16d
* commit '75848bd16d21400a784916232b269c9aa574b0eb':
Rewrite X509TrustManagerExtensionsTest
Change-Id: I18a4beea71323de992555412749d9a33998a0740
2016-04-22 15:51:47 +00:00
Chad Brubaker
595345b556
Merge "Rewrite X509TrustManagerExtensionsTest" into nyc-dev
...
am: 1f8d6e8659
* commit '1f8d6e865939d4ca00157216f70edd02eadc1cac':
Rewrite X509TrustManagerExtensionsTest
Change-Id: I0bfdcff66da33ba7219da69f8607addb34fdd236
2016-04-22 15:49:25 +00:00
Chad Brubaker
bac071b74f
Rewrite X509TrustManagerExtensionsTest
...
X509TrustManagerExtensionsTest used internal implementation details to
test X509TrustManagerExtensions#isUserAddedCertificate, these
implementation details are no longer the same and so this test failed to
catch the API being broken and then incorrectly flagged the fixed API as
broken.
To ensure that isUserAddedCertificate is properly covered the tests for
the API are split into two places: X509TrustManagerExtensionsTest covers
tests for the default case where there are no added CAs and
CaCertManagementTest to test the behavior when CAs have been added.
Bug:28262103
Change-Id: I14f3211c277fdc9c8bfc3d4ac932be375961fa28
2016-04-20 15:12:38 -07:00
Felipe Leme
eacd0c1670
Merge "Changed order of metered network check." into nyc-dev
...
am: 901854e
* commit '901854eb92bcc8b12d9aaf350210e72eb7585416':
Changed order of metered network check.
Change-Id: Iad87c8f35e2a1aac56b9581e2c3f035dd02141e0
2016-04-14 20:08:15 +00:00
Felipe Leme
0e47422a47
Changed order of metered network check.
...
BUG: 27808364
Change-Id: I8a1088673cdd2c310a787a0b0708ad58876e9ac0
2016-04-14 12:49:31 -07:00
Felipe Leme
c3b35400fb
Merge "Improvements on test case setup." into nyc-dev
...
am: 7b3ee10
* commit '7b3ee108ce80c23f99fc5120a762ac93ad8e708a':
Improvements on test case setup.
Change-Id: I945cd721b3983d0be4b66af74f1c0cfd284ddfe9
2016-04-14 19:05:37 +00:00
Felipe Leme
f744474a28
Improvements on test case setup.
...
- On hostside, checks if wi-fi is on instead of checking for connectivity (which can be very slow).
- Don't automatically reset metered network on superclass' tearDown().
- Make sure tearDown() cleans up all state changes.
BUG: 27808364
Change-Id: I4818047c5fb8f6f430b0aab5ecfa77717f860db3
2016-04-14 11:47:34 -07:00
Owain Davies
c408601c24
Add assertion message if testDns ipv6 lookup reutrns ipv4.
...
Some partner test networks connect by VPN and if the connection
fails during the testing this test will fail as the local internet
provider intercepts the DNS request and returns an ipv4 address.
Added a message to check the network configuration and rerun the test.
Bug: 26560000
Change-Id: I54e4976b2cef549bfe9fd55ff9609ba2e6513239
2016-04-14 16:12:38 +01:00
Owain Davies
8884aac68d
Added assertion message to testDns failures
...
Identify tests that fail testDns because of no network connection.
Bug:26560000
Change-Id: I7683d54d2932ec46c5850bf360c602f6548b179e
2016-04-14 15:54:44 +01:00
Dianne Hackborn
f50e4b1f5b
Merge "Test for issue #28156248 : Receiving connectivity receiver..." into nyc-dev
...
am: 9a36b2a
* commit '9a36b2aab7fba6948527b59596b148fe6f0221a0':
Test for issue #28156248 : Receiving connectivity receiver...
Change-Id: I4d0b54ee9e2f74f5a2ded4edb376e1ea157acc5e
2016-04-14 04:20:48 +00:00
Dianne Hackborn
d5dc8fe740
Test for issue #28156248 : Receiving connectivity receiver...
...
...broadcasts in Android N
New test to verify that modern apps can't receive CONNECTIVITY_CHANGE.
Change-Id: I9c5b6e99d14b782b3857460d8297f6a405545d87
2016-04-13 18:05:50 -07:00
Erik Kline
77bd264c3b
Merge "Extend CTS test coverage to include registerDefaultNetworkRequest()" into nyc-dev
...
am: c2f9d8f
* commit 'c2f9d8f3db67f3802ed9a2cd0e91575674b12d58':
Extend CTS test coverage to include registerDefaultNetworkRequest()
Change-Id: Id9756021ea4e873b39371870ee4a9130890a58e4
2016-04-06 09:22:36 +00:00
Erik Kline
8d422e8c57
Extend CTS test coverage to include registerDefaultNetworkRequest()
...
Change-Id: I36491c2697ed1510da38c06324d2e4ddf653bc4e
2016-04-06 12:31:32 +09:00
Felipe Leme
faf0a62b69
Merge "Refactored tests to use \'list wifi-networks\'." into nyc-dev
...
am: 204f3e8
* commit '204f3e835668d606ae175bc55e3af3223e106364':
Refactored tests to use 'list wifi-networks'.
Change-Id: Idd3ce63df04d1ca33aefd993a9487dbef0b47883
2016-04-01 23:56:15 +00:00
Felipe Leme
52be3a68ad
Refactored tests to use 'list wifi-networks'.
...
BUG: 27808364
Change-Id: Ife3f35e9c3c6a4285b671eeb7d7d0223be908a1b
2016-04-01 15:40:41 -07:00
Felipe Leme
b7eab9574f
Merge "Moved wi-fi switch to hostside." into nyc-dev
...
am: af09243
2016-04-01 17:51:32 +00:00
Felipe Leme
af092432df
Merge "Moved wi-fi switch to hostside." into nyc-dev
2016-04-01 17:40:15 +00:00
Philip P. Moltmann
85113d6739
Merge "Test that we can set and read txt records." into nyc-dev
...
am: 058f525
2016-03-31 04:00:18 +00:00
Philip P. Moltmann
058f525d35
Merge "Test that we can set and read txt records." into nyc-dev
2016-03-31 03:52:48 +00:00
Felipe Leme
eac0fe6ab1
Moved wi-fi switch to hostside.
...
BUG: 27808364
Change-Id: I89bca5f5ba90a7dc145d2ac170fd505161fd073d
2016-03-30 18:17:43 -07:00
Felipe Leme
4b9c2ac614
Fixed build broken by bad merge.
...
am: bbb00ff
2016-03-31 00:31:32 +00:00
Felipe Leme
bbb00ffc0f
Fixed build broken by bad merge.
...
BUG: 27324964
Change-Id: Idbe6f8237b560db31eb949971358db41ac00d530
2016-03-30 16:37:24 -07:00
Felipe Leme
e4f6db2603
Test network restrictions while on foreground service state.
...
am: eb7e505
2016-03-30 22:43:36 +00:00
Felipe Leme
c61593cf6e
Improved test case for blacklist access.
...
am: 9a4643c
2016-03-30 22:32:42 +00:00
Felipe Leme
eb7e5053c1
Test network restrictions while on foreground service state.
...
BUG: 27324964
BUG: 26776313
Change-Id: Idcd0a391333d243d17b6bd68c67becaad2b37fdd
2016-03-30 22:32:27 +00:00
Felipe Leme
9a4643cd0e
Improved test case for blacklist access.
...
BUG: 27127112
BUG: 26685616
Change-Id: I8b183cdb1cf5ebbc446176a042e4196ab063f1a3
2016-03-30 22:27:51 +00:00
Felipe Leme
0790992f57
Merge "Refactored method to get UIDs." into nyc-dev
...
am: 3787c6b
2016-03-30 17:43:47 +00:00
Felipe Leme
3787c6bb7e
Merge "Refactored method to get UIDs." into nyc-dev
2016-03-30 17:09:11 +00:00
Felipe Leme
c3d29ebf21
Refactored method to get UIDs.
...
BUG: 27904062
Change-Id: Ib0d3911f40e0a5deed833f71e75abd10a224768f
2016-03-30 10:07:20 -07:00
Felipe Leme
a2342c6fc0
Merge "Added sanity check to verify process state." into nyc-dev
...
am: 3aef04b
2016-03-30 15:54:05 +00:00
Felipe Leme
3aef04bf0d
Merge "Added sanity check to verify process state." into nyc-dev
2016-03-30 15:41:51 +00:00
Felipe Leme
de7cbcf6ee
Added sanity check to verify process state.
...
BUG: 26776313
BUG: 27324964
Change-Id: I209c04d5c6d89acdac9b5bdaee5a4dbd7700c53e
2016-03-29 17:57:14 -07:00
Philip P. Moltmann
10788e7864
Test that we can set and read txt records.
...
Bug: 27696905
Change-Id: I494665adeb8a859791bb5d08fe5b6ee73f20ac8d
2016-03-29 11:28:23 -07:00
Wally Yau
a5d2a5e761
Merge "Fixed test for lingering traffic data." into marshmallow-cts-dev am: 0f7a74c am: 8bdae23 am: 810b12c am: 324a5da am: 9a60672
...
am: 825b3f1
2016-03-28 22:25:25 +00:00
Wally Yau
825b3f1595
Merge "Fixed test for lingering traffic data." into marshmallow-cts-dev am: 0f7a74c am: 8bdae23 am: 810b12c am: 324a5da
...
am: 9a60672
* commit '9a606728458d1abc646fd39d32d273a5634c9142':
Fixed test for lingering traffic data.
2016-03-28 18:36:11 +00:00
Wally Yau
324a5da160
Merge "Fixed test for lingering traffic data." into marshmallow-cts-dev am: 0f7a74c am: 8bdae23
...
am: 810b12c
* commit '810b12cbb62c4c91f5deab49b228916bdb6f2708':
Fixed test for lingering traffic data.
2016-03-28 18:12:25 +00:00
