Commit Graph

416 Commits

Author SHA1 Message Date
Daniel Xie
affc5b6a52 am db636cae: am 91a9bc2a: am 67651de7: am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit 'db636cae9539b9ddc83f066e1c2bd4c61a98deff':
2015-09-15 01:17:05 +00:00
Daniel Xie
db636cae95 am 91a9bc2a: am 67651de7: am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
* commit '91a9bc2ac2e907be881a4cfabcdef7ed2d8a9445':
2015-09-15 01:06:36 +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
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
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
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
9417d7288d am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit 'ea9003d9692e1fc1384a02686c3d36f195d9d55e':
  Support WiFi only device at runtime.
2015-08-05 18:28:01 +00:00
Daniel Xie
ea9003d969 am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit '2b44bd54f88a4374ea631994650d464df4d6fe4e':
  Support WiFi only device at runtime.
2015-07-28 18:15:16 +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
92ec8f7720 am c4b48e7e: am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe
* commit 'c4b48e7e39465eb0bb34d481e4dc46b5e8a4239c':
  Fix CTS build
2015-07-15 05:50:51 +00:00
JP Abgrall
c4b48e7e39 am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe
* commit '4e7386bda93c41b622c64b1ce17b7d1b8bd503fd':
  Fix CTS build
2015-07-15 05:37:08 +00: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
470d17043a am b2ff97c6: am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf
* commit 'b2ff97c6589dd3d3c5e3da5f7c7a69b7a42fb317':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 22:19:12 +00:00
Unsuk Jung
b2ff97c658 am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf
* commit '183662b8269c2f2b1b63a3791c663c46d14a3d90':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 22:03:46 +00: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
0406d1503e am 1b8da7ba: am ed2905ca: am fba908c2: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e automerge: a011f00
* commit '1b8da7bab7ed6b13fe436532aab8b17f513c3e2e':
  Lookup private resources in run-time
2015-06-29 18:35:13 +00:00
Daniel Xie
1b8da7bab7 am ed2905ca: am fba908c2: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e automerge: a011f00
* commit 'ed2905ca1dba9268bf3a617274297fa8f3d400e9':
  Lookup private resources in run-time
2015-06-29 18:21:58 +00: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
d57ae212df am 8a37e0b3: am 48c2210b: am 4a4d6864: Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev
* commit '8a37e0b3eb18598acef27dc774c2ab15bf881a74':
  Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class
2015-06-05 23:33:18 +00:00
Daniel Xie
8a37e0b3eb am 48c2210b: am 4a4d6864: Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev
* commit '48c2210b5e45e3be88064a7f64b3d197b973d2a4':
  Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class
2015-06-05 23:23:04 +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
Daniel Xie
5aa28eadc3 resolved conflicts for merge of 5ebf501b to lmp-mr1-modular-dev
Change-Id: I2070627dc3858b2baefcfdb0e975cfb9fc50b7a0
2015-06-03 16:44:59 -07:00
Daniel Xie
5ebf501b41 resolved conflicts for merge of 42b3de74 to lmp-mr1-app-dev
Change-Id: I9c21d9f5dbc269bb0066d184895c9dca691a1f98
2015-06-03 21:21:34 +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
7f58cec67e am 762d1115: am be5ae9fb: am 95c40906: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 1840edc
* commit '762d111509a0daba5f19cf1af8411a38684507e1':
  Accept more than one SD in NsdManagerTest
2015-06-02 23:46:52 +00:00
Daniel Xie
762d111509 am be5ae9fb: am 95c40906: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 1840edc
* commit 'be5ae9fb0797e754f6e5ca8a5a91ab867e455cb7':
  Accept more than one SD in NsdManagerTest
2015-06-02 23:35:11 +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
Qiwen Zhao
cbdec383f2 DO NOT MERGE ANYWHERE.
Revert "DO NOT MERGE ANYWHERE."

This reverts commit b7c798f9b84c7c100aa37e6aa77e7f31460c7bd7, reversing
changes made to 4e8ecc32db5d3a17ccec099681425c34b630d23b.
2015-03-30 10:51:01 -07:00
Vinit Deshpande
08d039bc85 am 0d407aea: Merge "Accept more than one SD in NsdManagerTest"
* commit '0d407aeaa8a31cb44b3b233f0b6807053dbaf08e':
  Accept more than one SD in NsdManagerTest
2015-02-04 02:17:49 +00:00
Vinit Deshpande
0d407aeaa8 Merge "Accept more than one SD in NsdManagerTest" 2015-02-04 02:07:55 +00:00
Elliott Hughes
81914b4460 am 82903d84: Merge "Add missing include."
* commit '82903d843879fa71274c56c3273ea10de5a43bb9':
  Add missing include.
2015-01-30 21:16:10 +00:00
Elliott Hughes
82903d8438 Merge "Add missing include." 2015-01-30 07:04:38 +00:00
Elliott Hughes
17e2c23ad3 Add missing include.
Change-Id: I2a52d050a39e2c6dd38af868ea444278d9b6d54d
2015-01-29 23:02:17 -08:00
Takayuki Hoshi
c83ebec5fe am 48d3a66c: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
* commit '48d3a66c9e424aa7cce8009a9ccc94a97b0d86a5':
  Normalize ipv6.cts.PingTest#testLoopbackPing's packet size
2015-01-21 03:05:55 +00:00