Vinod Krishnan
149b73a246
am 4fed4153: Merge "Small change to CTS" into klp-modular-dev
...
* commit '4fed4153f565a48f4be90e550763767bde7d36b0':
Small change to CTS
2014-06-06 00:16:25 +00:00
Vinod Krishnan
5f308a9b10
Small change to CTS
...
Change-Id: I7b31bd6b05dd1379dcf7d4627eee1856fda87164
2014-06-05 15:03:18 -07:00
Bill Yi
599f068ea9
am a52d69f6: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master
...
* commit 'a52d69f62e33ff4a690ff5d18be8723087cd22c4':
2014-04-30 00:17:06 +00:00
Bill Yi
a52d69f62e
Merge klp-dev-plus-aosp into stage-aosp-master
...
Change-Id: Ib7b1888248402804ce55782f52d08bf17fb434de
2014-04-29 15:28:59 -07:00
Elliott Hughes
6a1c0059b1
am 2fed6caf: Merge "Libcore.os has moved to android.system.Os."
...
* commit '2fed6caf1a2fda1783116b9c3749d4e365fdd787':
Libcore.os has moved to android.system.Os.
2014-04-25 00:42:29 +00:00
Elliott Hughes
81f625634e
Libcore.os has moved to android.system.Os.
...
Change-Id: Icfd1cffbed754c147f83fc42ce905beb7904340c
2014-04-24 16:58:17 -07:00
JP Abgrall
8083b7e660
am 03a9e6ed: Merge "Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue"
...
* commit '03a9e6ed450c6c5f77b201c4d95cb10cf22d3a7c':
Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2014-04-02 18:40:14 +00:00
JP Abgrall
03a9e6ed45
Merge "Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue"
2014-04-02 18:32:01 +00:00
Junjie Hu
0d4434d998
Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
...
For testTrafficStatsForLocalhost's UID testing, it will also calcuate the wlan0 interface.
There are some TCP re-tranmission in SSLCertificateSocketFactoryTest and it is the same UID as this test case. Need to consider those extra pacetks.
For example,
Before testTrafficStatsForLocalhost test casae:
01-08 15:49:11.316 7826 7839 D TrafficStats: parseUidStats, buffer: 14 wlan0 0x0 10067 0 31857 67 4582 55 31857 67 0 0 0 0 4582 55 0 0 0 0
01-08 15:49:11.335 7826 7839 D TrafficStats: parseUidStats, buffer: 24 lo 0x0 10067 0 40 1 60 1 40 1 0 0 0 0 60 1 0 0 0 0
After testTrafficStatsForLocalhost test casae:
01-08 15:49:19.210 7826 7839 D TrafficStats: parseUidStats, buffer: 14 wlan0 0x0 10067 0 31857 67 4738 58 31857 67 0 0 0 0 4738 58 0 0 0 0
01-08 15:49:19.212 7826 7839 D TrafficStats: parseUidStats, buffer: 24 lo 0x0 10067 0 1155336 2053 1155408 2054 1155336 2053 0 0 0 0 1155408 2054 0 0 0 0
=> There are three extra IP packets after testing due to TCP FIN retreamsisions in previous test case
Suggest to add some extra IP packets for consider the extra traffic in wlan0 interface.
Signed-off-by: Junjie Hu <junjie.hu@mediatek.com >
Change-Id: I981f98fc8647469fb105361516b6a59c53530c70
2014-04-02 15:12:32 +08:00
Lorenzo Colitti
e0265033ec
am 047db28d: Merge "Test both recvfrom() and read() in PingTest."
...
* commit '047db28da2ed1ceb56f47f17509a750058099605':
Test both recvfrom() and read() in PingTest.
2014-03-07 01:35:17 +00:00
Lorenzo Colitti
70269974fb
am 4bc3fb89: Merge "Document kernel code necessary to pass PingTest."
...
* commit '4bc3fb892f3409feeed70fab0cecf2625e1b1cd3':
Document kernel code necessary to pass PingTest.
2014-03-07 01:34:21 +00:00
Daniel Kim
8c2ae7b418
am 2f35ccfb: am 69d3004e: am 0979fd66: am e51c7a43: am 6b21c965: am 467eda57: am 14ba13d4: am 2678d5bc: cherry pick from aosp. https://android-review.googlesource.com/63805
...
* commit '2f35ccfbcf47cda70c21f28e410bdd3233ec8477':
cherry pick from aosp. https://android-review.googlesource.com/63805
2014-02-05 22:26:19 +00:00
Daniel Kim
69d3004ed7
am 0979fd66: am e51c7a43: am 6b21c965: am 467eda57: am 14ba13d4: am 2678d5bc: cherry pick from aosp. https://android-review.googlesource.com/63805
...
* commit '0979fd6697e4880cbcfd67b76ac71d8b5ad77f90':
cherry pick from aosp. https://android-review.googlesource.com/63805
2014-02-05 22:19:50 +00:00
Daniel Kim
e51c7a43f0
am 6b21c965: am 467eda57: am 14ba13d4: am 2678d5bc: cherry pick from aosp. https://android-review.googlesource.com/63805
...
* commit '6b21c965059549397168991741474ebc75f02d4f':
cherry pick from aosp. https://android-review.googlesource.com/63805
2014-02-05 22:11:41 +00:00
Daniel Kim
6b21c96505
am 467eda57: am 14ba13d4: am 2678d5bc: cherry pick from aosp. https://android-review.googlesource.com/63805
...
* commit '467eda5756e85388e41fbedc34f4d0f2f411d710':
cherry pick from aosp. https://android-review.googlesource.com/63805
2014-02-05 14:08:33 -08:00
Daniel Kim
467eda5756
am 14ba13d4: am 2678d5bc: cherry pick from aosp. https://android-review.googlesource.com/63805
...
* commit '14ba13d4bceef04e586220bef386d3224eda4ae8':
cherry pick from aosp. https://android-review.googlesource.com/63805
2014-02-05 14:02:08 -08:00
Daniel Kim
14ba13d4bc
am 2678d5bc: cherry pick from aosp. https://android-review.googlesource.com/63805
...
* commit '2678d5bcf77cd494967c1e4183168f7ea88c72bb':
cherry pick from aosp. https://android-review.googlesource.com/63805
2014-02-05 13:59:16 -08:00
Daniel Kim
2678d5bcf7
cherry pick from aosp.
...
https://android-review.googlesource.com/63805
Fix for Wifi watchdog test when Wifi is not supported
Added a check to see if Wifi is supported like other tests in the class
Signed-off-by: Daniel Kim <daniel.kim@panasonic.aero >
2014-02-05 21:53:37 +00:00
Lorenzo Colitti
047db28da2
Merge "Test both recvfrom() and read() in PingTest."
2014-02-03 23:30:55 +00:00
Lorenzo Colitti
0ffaf6dba7
Test both recvfrom() and read() in PingTest.
...
Change-Id: I2f49534f22bd718ce08c3408e38eeb97e09e5d6c
2014-02-03 12:40:20 -08:00
Lorenzo Colitti
4bc3fb892f
Merge "Document kernel code necessary to pass PingTest."
2014-02-03 20:18:54 +00:00
Lorenzo Colitti
0244dd7e3e
Document kernel code necessary to pass PingTest.
...
Change-Id: If6fec0c5193cd897b4c3534843bcd589b40c2948
2014-01-30 11:55:49 -08:00
Alex Klyubin
652d30b4b5
Test default config of SSLCertificateSocketFactory.
...
Bug: 11220570
Change-Id: I37440f3e8eda18215b9af703c027e4c8ca0334bf
2014-01-16 14:52:46 -08:00
Unsuk Jung
210c29288e
Merge "Lookup private resources in run-time"
2014-01-08 22:49:55 +00:00
Stuart Scott
09177f6888
am 823161c9: am 16be4106: Merge "Refactoring CTS to remove PTS references." into klp-dev
...
* commit '823161c92250a4aad687a488c4f63e4704d02660':
Refactoring CTS to remove PTS references.
2013-11-08 15:02:10 -08:00
Stuart Scott
7fd24cb8df
Refactoring CTS to remove PTS references.
...
PTS is now a part of CTS
bug: 11561456
Change-Id: I577296fe7735790e285aa4747dc7832bc8ae5b6d
2013-11-08 14:29:01 -08:00
Johan Redestig
b29370db34
Lookup private resources in run-time
...
This fixes the following cases for us:
android.net.cts.ConnectivityManagerTest#testGetAllNetworkInfo
android.net.cts.ConnectivityManagerTest#testGetNetworkInfo
android.net.cts.ConnectivityManagerTest#testIsNetworkSupported
android.net.cts.ConnectivityManagerTest#testRequestRouteToHost
android.net.cts.ConnectivityManagerTest#testSetNetworkPreference
We need to use the prebuilt binary but that has dependency to
private resource identities that differs in our environment. With
this change the resources are looked up in run-time to avoid the
build time dependency.
Change-Id: I6579338b591ca7a0da3f03f796136269c7789780
2013-10-30 14:22:07 +01:00
Vinit Deshapnde
c9d053c967
am a865f6fd: am 6aa39363: Merge "Ignore duplicate events from mDNS stack in CTS" into klp-dev
...
* commit 'a865f6fd03933b923f3b8953393a001996e08a6b':
Ignore duplicate events from mDNS stack in CTS
2013-10-11 15:03:28 -07:00
Vinit Deshapnde
851672c1ed
Ignore duplicate events from mDNS stack in CTS
...
It is too late to fix the duplicate events, and they may have existed
in JB-MR2 as well. So fixing CTS to ignore them for now.
Bug: 11049532
Change-Id: I0785a32dbac04eacb6994b428b12ce1ec27945d2
2013-10-10 14:56:43 -07:00
Vinit Deshapnde
947e251874
am 727b0dd2: Merge "Fix broken DNS Test" into klp-dev
...
* commit '727b0dd201e3216ad9d05788b1d08d4fc3eba27d':
Fix broken DNS Test
2013-09-23 19:00:43 -07:00
Vinit Deshapnde
e52091e2cc
Fix broken DNS Test
...
Couple of lines were just wrong (typo?) - and I have reduced our dependence
on multiple static IPs (used to test reverse mapping). It can still get
broken when external servers change their IP addresses though.
Bug: 8658901
Change-Id: I745c958df2f61130798552f0f5f736c73fb5de30
2013-09-23 16:21:04 -07:00
JP Abgrall
22dd368f17
am ebcfec2e: Merge "TrafficStats: fix uncertainty in flushing network traffic" into klp-dev
...
* commit 'ebcfec2ee32ea882714d6ca50cd7b78c8c9c496f':
TrafficStats: fix uncertainty in flushing network traffic
2013-09-13 13:20:27 -07:00
JP Abgrall
af3296605b
TrafficStats: fix uncertainty in flushing network traffic
...
Flushing TCP traffic isn't reliable enough to force a packet on the socket,
even with Nagle disabled.
The kernel's socket sendto() is being invoked with 1024 bytes each time,
but something deeper in the stack is merging packets.
So now we wait 5ms between each of the 1024 packets after flushing.
This allows running the test overnight in a loop without failure
instead of only ~5 times.
The error messages are now more detailed.
Bug: 10668088
Change-Id: Ic47bec81c6dba2fad8b96eb4a41f183115c371de
2013-09-12 15:06:20 -07:00
Brian Carlstrom
19552ab1b4
am 4c23360a: am 5f3ee644: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com"
...
* commit '4c23360ada30cde9e22a9cf4aded2ca403e6bc39':
Change SSLCertificateSocketFactoryTest to use googlemail.com
2013-08-27 11:31:49 -07:00
Brian Carlstrom
5f3ee644a6
Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com"
2013-08-27 18:27:06 +00:00
Brian Carlstrom
4bc10e0fbe
Change SSLCertificateSocketFactoryTest to use googlemail.com
...
Bug: 10351880
(cherry picked from commit 5d5ff5a81d )
Change-Id: Ied4db819e0a62352776f7b19365e30a079a51b9f
2013-08-27 11:21:50 -07:00
Brian Carlstrom
a461b43a95
am 5a2906a8: am 19a37cad: am 6469dee2: am d15dd73c: am d26b8028: am 64bb1b75: am 799044f3: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev
...
* commit '5a2906a8e88154a6647f1d30079039a2bd712a4d':
Change SSLCertificateSocketFactoryTest to use googlemail.com
2013-08-26 14:42:49 -07:00
Brian Carlstrom
5a2906a8e8
am 19a37cad: am 6469dee2: am d15dd73c: am d26b8028: am 64bb1b75: am 799044f3: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev
...
* commit '19a37cadda2f6e3b15c023c51eb9355ea49ca879':
Change SSLCertificateSocketFactoryTest to use googlemail.com
2013-08-26 14:40:00 -07:00
Brian Carlstrom
19a37cadda
am 6469dee2: am d15dd73c: am d26b8028: am 64bb1b75: am 799044f3: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev
...
* commit '6469dee2c0a7b6c51eafbbef339878fcc42ad962':
Change SSLCertificateSocketFactoryTest to use googlemail.com
2013-08-26 14:36:16 -07:00
Brian Carlstrom
6469dee2c0
am d15dd73c: am d26b8028: am 64bb1b75: am 799044f3: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev
...
* commit 'd15dd73c1d2e887d53d530c5188539d9a9759a8b':
Change SSLCertificateSocketFactoryTest to use googlemail.com
2013-08-26 14:34:02 -07:00
Brian Carlstrom
d26b802822
am 64bb1b75: am 799044f3: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev
...
* commit '64bb1b75488afc169e1f50db2228b563889fc000':
Change SSLCertificateSocketFactoryTest to use googlemail.com
2013-08-26 14:28:55 -07:00
Brian Carlstrom
64bb1b7548
am 799044f3: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev
...
* commit '799044f32079eea8e057afda4d07b173db5da4d8':
Change SSLCertificateSocketFactoryTest to use googlemail.com
2013-08-26 14:26:44 -07:00
Brian Carlstrom
799044f320
am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev
...
* commit '505ce805c31d697dd12bb2c033eb69b3d7ec9696':
Change SSLCertificateSocketFactoryTest to use googlemail.com
2013-08-26 14:23:39 -07:00
Brian Carlstrom
27c7fe5420
Change SSLCertificateSocketFactoryTest to use googlemail.com
...
Bug: 10351880
(cherry picked from commit d6e12427d0b69032fc82d0635a7b10bdbd39c78c)
Change-Id: I0d2708c507da5cd84f61bdd50ac3b76b3ac15a0d
2013-08-22 12:42:50 -07:00
Brian Carlstrom
5d5ff5a81d
Change SSLCertificateSocketFactoryTest to use googlemail.com
...
Bug: 10351880
Change-Id: I759fe361b0c543535d100ca26ca5047ff4dbc026
2013-08-21 23:13:15 -07:00
Lorenzo Colitti
58a91ac733
Add a CTS test for IPv6 ping socket support.
...
IPv6 ping socket support is needed for apps to successfully run
ping6, but the kernel support was only merged recently. This
test ensures that the required kernel support is available.
Bug: 9701153
Change-Id: Ieac32ca9dbcaf3890fa3e57c1326fa83787ac6d1
2013-08-21 22:06:43 +09:00
Wink Saville
a73db07a53
Add test for TYPE_MOBILE_IA.
...
Bug: 10373518
Change-Id: Ifb976760ea91a858bfc5387fb93e465665cf078f
2013-08-17 16:47:29 -07:00
Vinit Deshapnde
4fd65d09bc
Add a CTS test for NSD manager API
...
A simple test that registers, discovers and then resolves a service.
Bug: 9574276
Change-Id: I685df3c02112cf79b11b2c97efd560dda7232fda
2013-07-23 16:04:58 -07:00
The Android Open Source Project
3c83ae9dd7
am ca650c5c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit 'ca650c5c89d29c0468be5b8fab97fc91a0e18ce5':
2013-07-01 07:44:21 -07:00
The Android Open Source Project
ca650c5c89
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I650c2594940e3e33e8824254a6204feb1439038e
2013-07-01 07:42:20 -07:00