Commit Graph

368 Commits

Author SHA1 Message Date
Unsuk Jung
7bc2c81736 am f742ea6d: am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit 'f742ea6d30fde381f6b93776fe247b232edebd74':
2015-09-15 00:50:55 +00:00
Daniel Xie
91a9bc2ac2 am 67651de7: am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit '67651de7590224c2483d0e574217a0939b5c78bd':
2015-09-15 00:50:33 +00:00
Unsuk Jung
f742ea6d30 am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit 'bfd0aabaa5222173f74915b68a560d098deebc80':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-12 04:08:15 +00:00
Daniel Xie
67651de759 am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit '32540663fe6b9982c4542a7371bc5280fdf6ba29':
  Lookup private resources in run-time
2015-09-12 04:07:55 +00:00
Unsuk Jung
bfd0aabaa5 am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit 'b8ad8a1a990597951faaf9e82722e628ff74c0e3':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-10 03:47:23 +00:00
Daniel Xie
32540663fe am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit '4ed5d94e1d5d3d4eb12bf7e2318cb6396315f2c1':
  Lookup private resources in run-time
2015-09-10 03:04:49 +00:00
Unsuk Jung
b8ad8a1a99 am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit '17607b8a36287108099db71b9a15f20d64434203':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-09 22:19:06 +00:00
Daniel Xie
4ed5d94e1d am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit 'ee05618ceb115b884afca1f88dfd1beca311fb29':
  Lookup private resources in run-time
2015-09-09 21:48:24 +00:00
Daniel Xie
424456969a Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
automerge: f6915b6

* commit 'f6915b6f02ea3ff39bab6bd993072c323f470f27':
  Support WiFi only device at runtime.
2015-07-25 04:58:57 +00:00
Daniel Xie
f6915b6f02 Merge "Support WiFi only device at runtime." into kitkat-cts-dev
automerge: 545427f

* commit '545427fc9ecf0d1ed3e4d34697e11e09c5775b63':
  Support WiFi only device at runtime.
2015-07-24 22:32:23 +00:00
Daniel Xie
545427fc9e Merge "Support WiFi only device at runtime." into kitkat-cts-dev 2015-07-23 17:41:42 +00:00
Liangcai Li
adbcf22426 Support WiFi only device at runtime.
As what is done in ConnectivityService to fix
bug: 8562845. Otherwise some related tests like 'testGetAllNetworkInfo'
would fail with runtime detection on WiFi only device.

Change-Id: I94922729c11826b3711abf42f594dcdd994324b6
Signed-off-by: Liangcai Li <liangcail@nvidia.com>
2015-07-23 15:42:27 +08:00
JP Abgrall
89b22492ee Merge "Fix CTS build" into lollipop-cts-dev
automerge: ab0f0fe

* commit 'ab0f0fe884c280adcde0259f4692cebfb3d0bf08':
  Fix CTS build
2015-07-15 05:21:41 +00:00
JP Abgrall
ab0f0fe884 Merge "Fix CTS build" into lollipop-cts-dev 2015-07-15 05:21:26 +00:00
JP Abgrall
810a62236c Fix CTS build
Revert "Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev"

This reverts commit 9feaaaf446, reversing
changes made to 65fbe1fcd153c5647f8d1e1a7443b3f04b7b25fd.
2015-07-14 18:59:40 -07:00
Unsuk Jung
3c88311fb9 Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
automerge: 9feaaaf

* commit '9feaaaf44682c72dc5c771c93ef01ec793b6a7e3':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 21:42:50 +00:00
Unsuk Jung
9feaaaf446 Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
automerge: 7e84d75

* commit '7e84d75c830b0ddaa499293723e427bca510dbaa':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 21:42:04 +00:00
Unsuk Jung
9d02ab8484 resolve merge conflicts of a97c792 to kitkat-cts-dev
Change-Id: I7598ab40b38b26e3ea6f38764dd6b6793e243c8f
2015-07-13 22:50:02 -07:00
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 Xie
fba908c274 Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
automerge: a011f00

* commit 'a011f009de12362f1a2b6fc92d2726be646a10f5':
  Lookup private resources in run-time
2015-06-29 18:05:50 +00:00
Daniel Xie
a011f009de Merge "Lookup private resources in run-time" into kitkat-cts-dev
automerge: ac8f57e

* commit 'ac8f57e86a06b04e2218da8c0deab5872e078ac7':
  Lookup private resources in run-time
2015-06-29 18:03:31 +00:00
Johan Redestig
5e671fabe6 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
(cherry picked from commit b29370db34)
2015-06-25 10:44:18 +00:00
Daniel Xie
4a4d686449 Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev 2015-06-05 23:00:48 +00:00
Junjie Hu
fe5e165d39 Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class
It is a issue caused by bad test case.
Please ensure the previous vpn connection is disconnected before running next
vpn test case, this will affect the test result.And the CTS test case also
tries to connect socket before the vpn rule is set in netd.
It is the same issue as http://b/18436087 .
The delay 300ms is too short, and recommend extend to 1000 or 3000 ms.
Since L MR1 is known as supporting some low memory device, we suggest fixing
the new CTS test case for some low-end devices.

Change-Id: I6051c95c663e867fc66c580ce8bd8d25fce0b8fc
Signed-off-by: Junjie Hu <junjie.hu@mediatek.com>
2015-06-05 15:52:52 +00:00
Amith Dsouza
e81d049a94 Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
automerge: 2e4ce59

* commit '2e4ce593e3b6c611783bc660f95e2e783e004cd3':
  LocalSocketTest.testAccessors: fix the *SendBufferSize* test
2015-06-03 16:02:48 +00:00
Amith Dsouza
2e4ce593e3 Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev 2015-06-03 16:01:31 +00:00
Daniel Xie
95c4090648 Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
automerge: 1840edc

* commit '1840edcd80a4bc62bae117848ef64a5c4bf83ef2':
  Accept more than one SD in NsdManagerTest
2015-06-02 23:18:57 +00:00
Daniel Xie
1840edcd80 Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev 2015-06-02 23:17:59 +00:00
Filip Matusiak
5aae92d233 Accept more than one SD in NsdManagerTest
In current implementation it's been assumed that there will be only one
interface registered for service discovery in mdnsresponder. In reality
there's possibility that some real but currently unused interfaces will
have link-local address assigned prior to registration, which will cause
mdnsresponder to register these interfaces for service discovery. This
will result in SERVICE_LOST and SERVICE_FOUND events to be received more
than one time. Current test implementation is not 100% prone for this
situation - depending upon time gap between both events it can PASS or
FAIL.

Fix by removing an assert on number of received events.

Change-Id: I147dc4d600f41f6d63d2b9e4bcb10efe90d5b3ec
(cherry picked from commit 970cbe09b5)
2015-06-02 23:17:22 +00:00
Constantin Musca
9288414c30 LocalSocketTest.testAccessors: fix the *SendBufferSize* test
If one sets a *SendBufferSize* value which is less than
(2048 + SKB_DATA_ALIGN(sizeof(struct sk_buff))) then the value
retrieved will be (2 * (2048 + SKB_DATA_ALIGN(sizeof(struct sk_buff)))).
Otherwise, the value will be doubled.
Modify the test to consider both cases.

Change-Id: I2d89393b1ad441783c8a082b072a806b8901830c
Signed-off-by: Constantin Musca <constantin.musca@intel.com>
2015-06-02 14:18:35 -07:00
Takayuki Hoshi
48d3a66c9e am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
* commit '2212f189a42be9b52e37a10e8b94d3d07c51e109':
  Normalize ipv6.cts.PingTest#testLoopbackPing's packet size
2015-01-21 02:52:51 +00:00
Takayuki Hoshi
013161a64a Normalize ipv6.cts.PingTest#testLoopbackPing's packet size
Bug: 19063377
Change-Id: I8c7b2253cfa5c81afbc6c4de05f2965f4184b683
2015-01-20 18:17:08 +09:00
Erik Kline
77b855a1a8 Merge "Consider VPN always to be a supported type." into lmp-mr1-dev 2015-01-08 01:55:46 +00:00
Lorenzo Colitti
83375d2bd2 Test TCP and ICMPv6 on VPNs in addition to UDP.
Bug: 15605143
Change-Id: Ifd7a646990619057e714a789902df2c157a768c0
2014-12-18 23:44:53 +09:00
Wei Liu
5747d9c5e3 am 913b9943: Skip testDnsWorks if the active network for watch is proxy.
* commit '913b99435035eca3be12eb31180dca54b2c79957':
  Skip testDnsWorks if the active network for watch is proxy.
2014-12-12 00:19:52 +00:00
Wei Liu
913b994350 Skip testDnsWorks if the active network for watch is proxy.
Bug: 18625962
Change-Id: I56dacf8d93c1557b44eaf80fbc80eb6a596a9436
2014-12-11 10:30:40 -08:00
Erik Kline
18fc2cd3c4 Consider VPN always to be a supported type.
Change-Id I02eb5f22737720095f646f8db5c87fd66da129d6 adds VPN as a
supported network type to all device configurations directly in
software, independent of any external per-device configuration.

Reflect this expectation in the test.

Bug: 18439110
Bug: 18668362
Change-Id: I7fca77e564219c96e8a78372d4885c7b7f012a48
2014-12-11 12:12:06 +09:00
Narayan Kamath
96f656c39e Track changes to Posix.* API.
We need to flip() the byte buffer before attempting to read
the data written to it.

bug: 18641009
Change-Id: I4c69f67bb74d84583c6f71488bdc3c9a683a4f18
2014-12-09 13:28:37 +00:00
Lorenzo Colitti
5d5cd1f27d Add a CTS test for the VPN API.
Bug: 15605143
Change-Id: I8e5f8b281b6ee16acf8daf1b4a1113847e1ccabd
2014-12-02 02:24:13 +09:00
Vinit Deshpande
1645296208 Remove enableNetwork(netId, disableOthers) check from CTS
We don't really disable any networks anymore; so there's not much to be
verified.

Bug: 17937171

Change-Id: I57e16953bdc0a698f3bc5fba555b39bc450c13ab
2014-10-23 17:02:19 -07:00
Vinit Deshpande
0b3e6eb196 Relax NsdManagerTest's duplicate event check
We have seen quite a few of these; and it doesn't seem to be pointing to
any device implementation problem. Hence relaxing the test.

Bug: 18005417
Change-Id: Iee983527ddff4f5336ccb48c04ce851102f13349
2014-10-22 19:37:52 -07:00
Wei Wang
3839734188 Add cts test for wifi scan timestamp.
Bug:18014366
Change-Id: Ie25c53eb12077f4f03f45c7e6828a8ace25c0fdb
2014-10-18 00:33:08 +00:00
Unsuk Jung
94995b1dc8 Build CTS tests as multilib apks
CTS-tradefed uses the same apk for both 32 and 64 bit tests.

Bug: 17924614
Change-Id: Idbf2d93c54efbb1c281ad9e93f0f39430614df61
2014-10-09 01:08:48 -07:00
Paul Jensen
67e673f04e Update CTS ConnectivityManager tests to work with L release.
Removed most of getNetworkPreference() and setNetworkPreference() tests as
these functions are now fully deprecated and do nothing.  Just test that
they are still callable.
Adjust startUsingNetworkFeature() and stopUsingNetworkFeature() failure
codes to match new behavior.
Tested on devices with Wifi and Cellular radios, and Wifi-only.

bug:17417896
bug:17354855
Change-Id: Iea8b25e399f4e5b6ec3d2101ebf520f89697c4da
2014-09-25 10:07:21 -04:00
Lorenzo Colitti
e6694c32fe Add a CTS test for multinetwork features.
For now, just checks that the kernel sysctls are present and
have the right permissions and expected values.

Bug: 15605143
Change-Id: I5feb6cb5f25b97e88cd0d9e8071213d13d4cc6e8
2014-07-16 22:10:04 +09:00
Benson Huang
23d0297286 am e2fc4e4e: am ad8f5b79: am 8b42ca86: am c893f50f: Fix CTS testStartUsingNetworkFeature_enableHipri fail
* commit 'e2fc4e4efb4b452d70e620f8f5bdaa637e19da04':
  Fix CTS testStartUsingNetworkFeature_enableHipri fail
2014-06-26 17:59:12 +00:00
Benson Huang
e2fc4e4efb am ad8f5b79: am 8b42ca86: am c893f50f: Fix CTS testStartUsingNetworkFeature_enableHipri fail
* commit 'ad8f5b79a042a333536e35528a18dff5e9f6d119':
  Fix CTS testStartUsingNetworkFeature_enableHipri fail
2014-06-26 17:54:09 +00:00
Benson Huang
ad8f5b79a0 am 8b42ca86: am c893f50f: Fix CTS testStartUsingNetworkFeature_enableHipri fail
* commit '8b42ca8621ada4a8139d964e867725d04dc4ca16':
  Fix CTS testStartUsingNetworkFeature_enableHipri fail
2014-06-26 17:48:36 +00:00
Benson Huang
c893f50f6f Fix CTS testStartUsingNetworkFeature_enableHipri fail
The return value of mWifiManager.isWifiEnabled()
&& mWifiManager.getConnectionInfo().getSSID() != null can not
correctly identify if WiFi is connected or not.

The fix is to modify the code logic used to judge if WiFi is connected.

Bug 15578218 and 15578219

Change-Id: I8ae40980c9cd1ea91dafe0ca7c893c84b35709bf
Signed-off-by: Benson Huang <benson.huang@mediatek.com>
2014-06-26 05:35:49 +00:00