Unsuk Jung
a97c792cbd
Merge "Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue" into jb-mr2-cts-dev
2015-07-13 23:43:34 +00:00
Junjie Hu
20b7b91edf
Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
...
(cherry-picked from master: 0d4434d998
conflict + added Log)
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
2015-07-10 19:28:44 -07: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
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
Robert Greenwalt
c8ddd2d780
Fix CTS test for scan-always-available env
...
Even if you disable wifi the supplicant will still be pingable
if we're set in always scanning mode. Make the test aware.
bug:9545987
Change-Id: I7f1bd0166b877a706de51f8ef169355c98ae25a3
2013-06-27 11:28:11 -07:00
Robert Greenwalt
69f9447ac9
DO NOT MERGE - remove dns test from MR2
...
bug:8658901
Change-Id: I979f38545d7bde91e3711d09ba4278e02183a05b
2013-05-21 16:37:17 +00:00
Robert Greenwalt
fc0f6f4721
Add debug logging.
...
Also fix timing issue with setNetworkPreference
bug:8658717
Change-Id: Ifc6de4758a3d800a52f4e53cb4c6d2a4c6109390
2013-04-25 17:08:18 -07:00
Irfan Sheriff
bc404f17a6
Merge "EAP API CTS tests" into jb-mr2-dev
2013-04-19 19:45:53 +00:00
Irfan Sheriff
9d24abdc7d
EAP API CTS tests
...
Bug: 8646305
Change-Id: Id5595ee0d1bfedae827df8c99516cd4e27d0a97a
2013-04-19 11:15:28 -07:00
Robert Greenwalt
5e1b502ce8
Add CTS tests for ConnectivityService
...
bug:4074341
Change-Id: Ic02d08e51c051789ed7fa1c949d42fa22bdc8a08
2013-04-15 22:50:28 +00:00
Jeff Sharkey
66bc4595dc
TrafficStats are always supported, tag tests.
...
Bug: 8417220
Change-Id: I2a06d2e752606cec4bfe35266d9e37271c275d95
2013-03-26 14:00:34 -07:00
Irfan Sheriff
98eea9f03a
Add cts to test quotes on ssid in WifiInfo
...
Bug: 7892415
Change-Id: I0e7b97762aa755f9d10655572be0ad550e370716
2013-03-22 13:56:42 -07:00
JP Abgrall
fe3b3f62a4
Fixup TrafficStats test wrt mobile vs total vs loopback
...
- Use getMobileBlabla() instead of getTotalBlabla()
- Have getTotalBlabla() reflect the fact that it includes loopback.
- Adjust checks to take headers, acks, and packet counts into account.
Change-Id: I9e1dfbbbdb9a6f932a14a2e3baee7a34469b9008
2013-03-04 18:58:07 +00:00
Robert Greenwalt
9ac09493ad
Add Dns CTS test.
...
Checks java and native calls.
Adds some performance tests, but need to look at how that should be used.
Change-Id: I158164829da13302d9532275cef3482c4736168e
2013-02-14 12:04:46 -08:00
Wink Saville
775417bd58
Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
...
Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
2013-01-28 20:00:57 -08:00
The Android Open Source Project
f9fa705fd9
am 29df52f8: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '29df52f86c4f6683e4ed847bdbadf0a0bd240869':
2012-11-06 11:24:34 -08:00
The Android Open Source Project
29df52f86c
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I130963155d1be3ddd2b1868b2f2ff0aa55411a19
2012-11-06 11:20:11 -08:00
The Android Open Source Project
6a8553a668
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ib3edff1606fee3fd6dc4f66ed8588d8a5fab5e07
2012-10-31 09:15:29 -07:00
The Android Automerger
97351eb43d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 08:52:26 -07:00
Jake Hamby
391465682a
am 566cad49: Fix race condition causing occasional CTS failures.
...
* commit '566cad494d504b60710640d931947cff6aade537':
Fix race condition causing occasional CTS failures.
2012-10-29 14:31:29 -07:00
Jake Hamby
566cad494d
Fix race condition causing occasional CTS failures.
...
WifiManagerTest was waiting for SUPPLICANT_STATE_CHANGED_ACTION
after enabling or disabling WiFi. Fix the code to check if the
WiFi state is already the desired state, and if not, to wait for
the WIFI_STATE_CHANGED_ACTION broadcast intent.
Bug: 7082455
Change-Id: Id1c2242c32311084f5587ea5403f6b227d1b8b04
2012-10-26 16:01:09 -07:00
The Android Automerger
c6fc53183e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-18 06:59:19 -07:00
Irfan Sheriff
e19be6022f
am 54b4f235: Merge "Make packet count test more robust" into jb-mr1-dev
...
* commit '54b4f235779385a0286675b0a2b1491ff0ebd854':
Make packet count test more robust
2012-10-17 16:51:22 -07:00
Irfan Sheriff
a0a19ea8aa
Make packet count test more robust
...
Ensure the packet count test does not fail due to a single attempt.
Our goal is to just ensure the packet count API exists.
Bug: 7001746
Change-Id: I8c6604528946166969126cd5b085024f81790a77
2012-10-17 16:12:19 -07:00
The Android Open Source Project
245483360b
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I8063d61628dd2822ab105f7f2f3d89fd0192b561
2012-09-20 10:34:59 -07:00
The Android Automerger
f9a11c0923
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-18 06:59:26 -07:00
Robert Greenwalt
f73614e0a0
am 2f5fb6dd: Merge "Fix NetworkInfo CTS test." into jb-mr1-dev
...
* commit '2f5fb6dde3c3209cbb124c6d989c3c4addc4e130':
Fix NetworkInfo CTS test.
2012-09-17 09:53:17 -07:00
Robert Greenwalt
3de9654925
Fix NetworkInfo CTS test.
...
bug:7074876
Change-Id: I29cf9086fda62dda8078b42a1632f139ec65ee52
2012-09-16 17:11:52 -07:00
The Android Open Source Project
b8f80e58b2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4ab99f1afaeb5abf8220704807cdd9d0fcd45f9d
2012-08-21 16:04:53 -07:00
The Android Automerger
da8aa37922
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-21 06:33:39 -07:00
Iliyan Malchev
dc679a6507
am 87abf00d: Merge "Revert "Revert "CTS for timestamp in ScanResult""" into jb-mr1-dev
...
* commit '87abf00d2fe3cfe14cbcb7e6bfa9d60e340efc5b':
Revert "Revert "CTS for timestamp in ScanResult""
2012-08-20 14:59:46 -07:00
Iliyan Malchev
87abf00d2f
Merge "Revert "Revert "CTS for timestamp in ScanResult""" into jb-mr1-dev
2012-08-20 14:58:31 -07:00
Iliyan Malchev
f1537c2ba4
Revert "Revert "CTS for timestamp in ScanResult""
...
With b/6979211 fixed, we can reinstate timestamps.
This reverts commit 72010dbfcf
Change-Id: I1066567c728b233ad1d6c6af912c32ef099580e6
2012-08-20 13:21:49 -07:00
The Android Open Source Project
f980b620d7
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I03d49c7a1f65fb04224bbc246d160e4dd3829d06
2012-08-16 19:09:50 -07:00
The Android Automerger
df68e37e22
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-16 06:33:20 -07:00
Yuhao Zheng
22ac505a61
am 72465772: CTS test for WiFi watchdog.
...
* commit '72465772e01ba5d05e8f9af138e9f303e5bb2865':
CTS test for WiFi watchdog.
2012-08-15 16:32:46 -07:00
Yuhao Zheng
72465772e0
CTS test for WiFi watchdog.
...
The new WiFi watchdog requires kernel/driver to export some packet loss
counters. This CTS tests whether those counters are correctly exported.
Change-Id: Ic764eff64ff2ef354b46f17e46eb74b14f191e4c
2012-08-15 15:24:36 -07:00
The Android Automerger
2886080e64
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-15 06:33:33 -07:00
Iliyan Malchev
9420b3fe53
Revert "CTS for timestamp in ScanResult"
...
This accompanies:
https://googleplex-android-review.googlesource.com/217002
This reverts commit e9adc27111
Change-Id: Ib37b72c59aad34fe9fd4461979c5f51af1218e37
2012-08-14 16:52:32 -07:00
Iliyan Malchev
72010dbfcf
Revert "CTS for timestamp in ScanResult"
...
This accompanies:
https://googleplex-android-review.googlesource.com/217002
This reverts commit e9adc27111
Change-Id: Ib37b72c59aad34fe9fd4461979c5f51af1218e37
2012-08-14 12:24:25 -07:00
Irfan Sheriff
e9adc27111
CTS for timestamp in ScanResult
...
Bug: 2961159
Change-Id: I8f1fd270a71173e2bd43b590914b7315232e4fba
2012-08-13 14:25:37 -07:00
Jean-Baptiste Queru
b59a2f446b
am dc250c32: Merge "Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest"
...
* commit 'dc250c329f994891fe4334f16681ddc05c573acd':
Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest
2012-08-08 12:00:06 -07:00
Jean-Baptiste Queru
dc250c329f
Merge "Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest"
2012-08-08 11:21:36 -07:00