Neil Fuller
83bddfd9ec
Merge "Add CTS tests for LocalSocket read/write timeouts"
2016-08-31 16:28:17 +00:00
Neil Fuller
52376fc1c8
Add CTS tests for LocalSocket read/write timeouts
...
The behavior was not previous covered and broke in N
due to commit c80af6d8. There is an associated fix
in frameworks/base.
Some refactoring of existing tests to reduce
duplication and tidy up sockets after tests.
Test: Ran the new CTS test (before and after related fix)
Bug: 31205169
Change-Id: Ie94335bc535beefcc5301d5469de6b8211af0bab
2016-08-31 13:12:54 +01:00
Neil Fuller
6406334d84
Merge "Initialize MockWebServer in setUp() not construction time"
...
am: f1026cb99e
Change-Id: I9c114d40171d73c90dcc4e2ef75a2239d39e4e81
2016-08-09 16:12:27 +00:00
Neil Fuller
f1026cb99e
Merge "Initialize MockWebServer in setUp() not construction time"
2016-08-09 16:06:23 +00:00
Neil Fuller
a87e5240cc
Initialize MockWebServer in setUp() not construction time
...
Should be a no-op but makes test suite creation cheaper.
Bug: 29820565
Change-Id: Ieee5568a6f477d591436275be4d4e7e3d5dbd322
2016-06-28 18:25:28 +01:00
Chih-hung Hsieh
9197c89071
resolve merge conflicts of 079d417 to stage-aosp-master
...
am: 64b0e44329
Change-Id: Ia3b91ebb942b4ab413ef4c76a06880c62e8581f9
2016-06-27 21:36:48 +00:00
Chih-Hung Hsieh
64b0e44329
resolve merge conflicts of 079d417 to stage-aosp-master
...
Change-Id: Ib8b7ed43d6c8dc4a9b843e6d2a974af30bcba0a0
2016-06-24 12:17:53 -07:00
Phil Weaver
3eab917a25
Merge \"CTS: Only listen to wifi events when toggling wifi\" into nyc-dev
...
am: 79fad1a209
Change-Id: Ieadf318b07d99acd8a2b73748fdac806731169d4
2016-06-23 01:57:27 +00:00
Phil Weaver
79fad1a209
Merge "CTS: Only listen to wifi events when toggling wifi" into nyc-dev
2016-06-23 01:48:11 +00:00
Phil Weaver
0d7d1da503
CTS: Only listen to wifi events when toggling wifi
...
When counting all connectivity changed events, we were failing
on devices with sim cards because we were counting both wifi and
mobile connectivity changes the same. Since the test only
toggles wifi, changing the listener only to pay attention to wifi
changes.
Bug: 29346253
Change-Id: I1ed3b976bc21419218c780d4afc4a5e73f128496
2016-06-22 16:50:38 -07:00
Chih-Hung Hsieh
60bd0b56fb
Fix misc-macro-parentheses warnings in cts.
...
Add parentheses around macro arguments used beside operators.
Use 'aoto' type to avoid clang-tidy warnings of missing parentheses
of 'TYPE *'.
Bug: 28705665
Change-Id: I5d2c3b2bdfb7775200f31a011758b9a35b14794d
2016-06-22 14:29:53 -07:00
Daniel Xie
949d019a45
Merge \\\\\\"Remove non-CTS packets assertion code\\\\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae am: 5c4a3982a8 am: fd1fb4d863 am: 995005d649
...
am: 86ba00d2a9
Change-Id: I5d1edb0f813aaf3aa6b4558e5ce21e6b60fa340d
2016-06-22 00:23:13 +00:00
Jun Tahara
86ba00d2a9
Merge \\\\\"Remove non-CTS packets assertion code\\\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae am: 5c4a3982a8 am: fd1fb4d863
...
am: 995005d649
Change-Id: I40f34d7a22b09a4ef5a4190f2a236b643062f306
2016-06-22 00:20:07 +00:00
Jun Tahara
fd1fb4d863
Merge \\\"Remove non-CTS packets assertion code\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae
...
am: 5c4a3982a8
Change-Id: Idcd4a248c8f74e095ba4162d8a468dbd962c8163
2016-06-22 00:14:51 +00:00
Jun Tahara
6ce150c6ae
Merge \"Remove non-CTS packets assertion code\" into marshmallow-cts-dev
...
am: 0ba763ab98
Change-Id: I9d9549d4388af53475a0457f7be1d55d88d5e72d
2016-06-22 00:09:33 +00:00
Lorenzo Colitti
0aeb28ea33
Merge \"Clear local test results across DNS lookups.\" into nyc-dev
...
am: cbdcf1d183
Change-Id: Id9a662ddec527356e0c8a2850da2dabca8a44fb9
2016-06-21 06:33:08 +00:00
Lorenzo Colitti
abc35d5527
Clear local test results across DNS lookups.
...
If InetAddress.getAllByName("ipv6.google.com") throws
UnknownHostException, the test silently ignores it. This
causes a misleading failure, because the test then reuses the
addrs variable that is left over from the previous DNS query
for "www.google.com", and fails because it has an IPv4 address.
Fixes: 12210306
Bug: 29231261
Change-Id: I1dde945765d40a84eba139055306b07ebc97d0ec
2016-06-21 13:39:49 +09:00
Jun Tahara
349f7ed040
Remove non-CTS packets assertion code
...
Symptom:
testTrafficStatsForLocalhost fails when applications or services
except CTS are using network.
Root cause:
testTrafficStatsForLocalhost can't calculate the number of
non-localhost packets for CTS.
It includes the all of packets for applications/services except CTS
and non-localhost packets for CTS.
Solution:
Remove this assertion and only logging the number of packets.
Change-Id: I49243d59f359f3a543c6bdb46f6a2645cde8f292
2016-06-20 17:50:39 +09:00
Felipe Leme
5d53b301dc
Merge \"Add non-parcelable extras to notification to make sure it does not crash the app.\" into nyc-dev
...
am: c72edd7a89
Change-Id: Icc8449c663d6fd97c8f8aff13afad936534a39a1
2016-06-16 18:35:13 +00:00
Felipe Leme
c3a9008e3d
Add non-parcelable extras to notification to make sure it does not crash
...
the app.
BUG: 29402928
Change-Id: I4fc47535ae14e71c50b25285b2fe5375abdb4f11
2016-06-16 10:03:27 -07:00
Lorenzo Colitti
d1970e861b
Merge \"Log the address of the IPv4 address that causes the test to fail.\" into nyc-dev
...
am: db3485a45e
Change-Id: Id3818163f9fef1b2ba9d7b29f6b0f84c6659625d
2016-06-09 07:53:30 +00:00
TreeHugger Robot
db3485a45e
Merge "Log the address of the IPv4 address that causes the test to fail." into nyc-dev
2016-06-09 07:46:17 +00:00
Lorenzo Colitti
1d75845bd5
Log the address of the IPv4 address that causes the test to fail.
...
Bug: 29231261
Change-Id: I6aac389d2c234091a284486422ee663119d021a9
2016-06-09 14:38:03 +09:00
Felipe Leme
b3f828552e
Merge "Changed network check URL." into nyc-dev
...
am: 1791555ca8
* commit '1791555ca880db2aaa909d6f04f6cd082f21df0a':
Changed network check URL.
Change-Id: I7722ad944c8d19a26412eb798f39dcfb74bc9dfe
2016-06-06 17:17:43 +00:00
Felipe Leme
1791555ca8
Merge "Changed network check URL." into nyc-dev
2016-06-06 17:09:36 +00:00
Felipe Leme
829443c140
Changed network check URL.
...
It cannot use google.com because it's blocked in some countries where
CTS tests are run.
BUG: 29082308
Change-Id: I749659ec2cd33248fddbe5b4ab02bd6e90f24a67
2016-06-06 16:05:57 +00:00
Felipe Leme
9f6d50289c
Merge "Skip Doze Mode-related tests when device does not support it." into nyc-dev
...
am: 07924c0489
* commit '07924c0489b60f460b285eddc69533cbda51f5a9':
Skip Doze Mode-related tests when device does not support it.
Change-Id: Ibbe3e77b88ffdcf7fe773aa18314661b59afca75
2016-06-02 21:43:46 +00:00
Felipe Leme
d1f3d68694
Skip Doze Mode-related tests when device does not support it.
...
Fixes: 29072117
Change-Id: I7ca37eae58258c021ed6297a9f1ee3b2749da7d7
2016-06-02 20:16:25 +00:00
Felipe Leme
8ce6537c06
Merge "Add flakyness check when a valid connection is expected." into nyc-dev
...
am: 8ee60199fd
* commit '8ee60199fd55b1ceefbb6c98a36a3d688c892f3f':
Add flakyness check when a valid connection is expected.
Change-Id: I5dcd03e34fc6ada0e8f49429f2a25f3cdb10e476
2016-06-02 17:45:30 +00:00
Felipe Leme
b9b85ce0cd
Add flakyness check when a valid connection is expected.
...
BUG: 29082308
Change-Id: Iadb9a0bd7fbd307d799af7a7a5dabc0ed000bc6d
2016-06-02 09:08:49 -07:00
Felipe Leme
f274abf6a5
Merge "Added test for whitelisting pending intent for Doze Mode." into nyc-dev
...
am: 12a8e761d2
* commit '12a8e761d2598672db4c4e221868985073f73ada':
Added test for whitelisting pending intent for Doze Mode.
Change-Id: Id56c18de63d9d1e617110506a3aaa0baffd73d16
2016-05-27 22:48:38 +00:00
Felipe Leme
4188bc32d5
Added test for whitelisting pending intent for Doze Mode.
...
BUG: 28818704
Change-Id: I927364e78cd73133899d67be23e0b274829686af
2016-05-27 14:21:36 -07:00
Phil Weaver
1a9e5fd490
Merge "CTS coverage: connectivity change, photo, + video" into nyc-dev
...
am: f057299a13
* commit 'f057299a13393fab596caccc3b9ac21fb5ecd599':
CTS coverage: connectivity change, photo, + video
Change-Id: Ic97685bfc46ac46536116bebc3a257f5734532b1
2016-05-25 23:17:42 +00:00
Phil Weaver
f057299a13
Merge "CTS coverage: connectivity change, photo, + video" into nyc-dev
2016-05-25 23:06:26 +00:00
Felipe Leme
3c4526d753
Merge "Use ConnectionManager API to check if network is metered." into nyc-dev
...
am: b853005f3c
* commit 'b853005f3ce50c6a51963cff2e6627d55c6012b0':
Use ConnectionManager API to check if network is metered.
Change-Id: I5f092fcc9b2220af3c033d84271c29e641027e4e
2016-05-25 17:00:54 +00:00
TreeHugger Robot
b853005f3c
Merge "Use ConnectionManager API to check if network is metered." into nyc-dev
2016-05-25 16:54:26 +00:00
Lorenzo Colitti
45af342981
Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev
...
am: 94636121f1
* commit '94636121f156c6b53a10b79f27d37c2a9c592f1c':
Add a test for closing sockets when a VPN comes up.
Change-Id: I0b23a38566afd96448a202d7a3b258d1960a53a3
2016-05-24 05:44:06 +00:00
TreeHugger Robot
94636121f1
Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev
2016-05-24 05:38:33 +00:00
Felipe Leme
68471ef930
Use ConnectionManager API to check if network is metered.
...
Also retry when getActiveNetworkInfo() returns null.
BUG: 28870582
BUG: 28909522
Change-Id: I4a43f171a7d6c73ea50555b66f858a54da65ae58
2016-05-23 11:33:34 -07:00
Phil Weaver
36f05df51f
CTS coverage: connectivity change, photo, + video
...
Confirming that connectivity change broadcasts can be received
when explicitly registering for them in N, and via the manifest
pre-N.
Confirming that new_photo and new_video broadcasts are not received.
Bug: 28122277
Change-Id: Icfc27364a41ee8f4a55920e295ba658a367bb7d2
2016-05-19 13:27:24 -07:00
Marcus Nascimento
6829652e87
Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f -s ours" into marshmallow-cts-dev am: a6aa5bce79 am: 9ef251d523 am: 1ad52d8800 am: 01c938ccb7 am: 64f19d0319
...
am: b232cf2d49
* commit 'b232cf2d49c66291e203d63b05cc0921170f42c2':
Add assertion messages to testStartUsingNetworkFeature_enableHipri.
Change-Id: I48999b9bc410228a67a52f4fedf85e613b2d3ebf
2016-05-19 18:26:21 +00:00
Marcus Nascimento
b232cf2d49
Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f -s ours" into marshmallow-cts-dev am: a6aa5bce79 am: 9ef251d523 am: 1ad52d8800 am: 01c938ccb7
...
am: 64f19d0319
* commit '64f19d031975520dc26fbe23c70a826e491032c9':
Add assertion messages to testStartUsingNetworkFeature_enableHipri.
Change-Id: I222dcf7299db1d2bac9641c5f200f69f87a21905
2016-05-19 18:23:44 +00:00
Marcus Nascimento
01c938ccb7
Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f -s ours" into marshmallow-cts-dev am: a6aa5bce79 am: 9ef251d523
...
am: 1ad52d8800
* commit '1ad52d8800d39194d738a0d805de134a833b412c':
Add assertion messages to testStartUsingNetworkFeature_enableHipri.
Change-Id: I5fe5ef00893350a7bf0d52176c0dc451d9e089a9
2016-05-19 18:09:28 +00:00
Marcus Nascimento
9ef251d523
Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f -s ours" into marshmallow-cts-dev
...
am: a6aa5bce79
* commit 'a6aa5bce79af1d1294ff815a396f1764fc703a27':
Add assertion messages to testStartUsingNetworkFeature_enableHipri.
Change-Id: Ib12541988e1c5154fd5343d8fec9e6628239238a
2016-05-19 17:54:53 +00:00
Android Merger
a6aa5bce79
Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f -s ours" into marshmallow-cts-dev
2016-05-19 17:28:36 +00:00
Marcus Nascimento
8074918f7f
Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev
...
am: 92849de21f -s ours
* commit '92849de21f245cd43c4c05b28fbf59ef6feb725a':
Add assertion messages to testStartUsingNetworkFeature_enableHipri.
Change-Id: Iabea0582c95db8353d3d7e4ec5008a45aa05b403
2016-05-19 17:28:26 +00:00
Daniel Xie
92849de21f
Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev
2016-05-19 16:39:30 +00:00
Felipe Leme
999a4fef2d
Merge "Added tests for idle apps and doze mode." into nyc-dev
...
am: f76c309ebe
* commit 'f76c309ebe0287aee4f729bbb997417ea938ef15':
Added tests for idle apps and doze mode.
Change-Id: I9acd82ca0cb163ea12281418e23dfea0f5cb32ac
2016-05-17 23:06:34 +00:00
TreeHugger Robot
f76c309ebe
Merge "Added tests for idle apps and doze mode." into nyc-dev
2016-05-17 22:40:45 +00:00
Aaron Holden
769683c76d
Merge "Remove module-level WifiCheck preparers" into nyc-dev
...
am: 4e0eb2e458
* commit '4e0eb2e4586a7e719e2deabcca1bd759a524a9e7':
Remove module-level WifiCheck preparers
Change-Id: Iae73d1aaf52636a9e492e69dbedb590699ce2746
2016-05-16 22:57:18 +00:00