Commit Graph

425 Commits

Author SHA1 Message Date
Bart Sears
aa43f342e1 am 512df522: am 525d2597: am d57e21f4: am a8a7282c: Merge "Fix CTS build" into mnc-dev
* commit '512df522ba49cf0cd4c6062ef89a66651231415a':
  Fix CTS build
2015-07-15 03:10:18 +00:00
JP Abgrall
0852bee4a9 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 19:13:31 -07:00
Unsuk Jung
189904be01 am 11fc5abf: am d619018e: am c92c2780: am 75cabb40: am 470d1704: 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 '11fc5abfa4814ba3429965053821ae93566237c8':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-15 00:00:21 +00:00
Unsuk Jung
75cabb40db am 470d1704: 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 '470d17043a32058f989ba5832cb5f0875ad29859':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 22:33:58 +00: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
Ang Li
9f80b1b93a am b8ff204d: am de0d14d5: am c43ab9ae: am fd5ffee7: Merge "Fix a naming error in WifiEnterpriseConfigTest.java b/22349111" into mnc-dev
* commit 'b8ff204d2a2703544a7286342f42b1f6ac6038aa':
  Fix a naming error in WifiEnterpriseConfigTest.java b/22349111
2015-07-09 23:17:53 +00:00
Ang Li
2ee5bd54a5 Fix a naming error in WifiEnterpriseConfigTest.java
b/22349111

Change-Id: Ic9c847dfb1d58f274e91e22042c07995c72daa12
2015-07-08 13:45:14 -07:00
Neil Fuller
e6f6d5cb67 am 10a6f377: am b23c9498: Merge "Fix missing socket closure in LocalSocketTest"
* commit '10a6f37757a36a2a05bd1b60af8b67d21d094a78':
  Fix missing socket closure in LocalSocketTest
2015-07-07 16:23:56 +00:00
Ang Li
0f708c80fd am 7335fa66: am a4ebccd7: am 4b578ecb: am f2e04bbb: Merge "Add CTS tests for passpoint APIs in enterprise config. b/22001019" into mnc-dev
* commit '7335fa6670e6e2ac966ffb450fbfbcf993edca6c':
  Add CTS tests for passpoint APIs in enterprise config. b/22001019
2015-07-06 23:10:26 +00:00
Ang Li
f2e04bbbe6 Merge "Add CTS tests for passpoint APIs in enterprise config. b/22001019" into mnc-dev 2015-07-06 21:32:52 +00:00
Neil Fuller
4a0a99fd08 am 42070100: am 5df46622: Merge "More tests for LocalSocket"
* commit '42070100bedf08b4d1622403b733abcbcd3b07a1':
  More tests for LocalSocket
2015-07-04 02:58:42 +00:00
Neil Fuller
0fe09fd769 am 6e15462e: am 82a3e51d: Merge "Modify test now that LocalSocket.getSoTimeout() does something"
* commit '6e15462e4b85f7d4b6773ae88d95cfe4a1b8ac2f':
  Modify test now that LocalSocket.getSoTimeout() does something
2015-07-04 02:58:33 +00:00
Neil Fuller
cb57c86657 Fix missing socket closure in LocalSocketTest
Noticed as a result of 8fbc09bde8.
One of the AF_UNIX sockets being created in three tests was not
being closed (until GC/finalization). Because the name is now
used in multiple tests some of the tests would fail in the CTS
test runner ("Address already in use") if no GC had occurred.

Bug: 3106438
Change-Id: I7debe5ed26d9d09e71a3d8a1b5b7d85b13e6e069
2015-07-03 17:45:11 +01:00
Neil Fuller
8fbc09bde8 More tests for LocalSocket
Tests for OutputStream.flush() and InputStream.available().

Bug: 3106438
Change-Id: I024e8fb95cc52678eb4b8df5584d21c9cf4b505a
2015-07-03 15:21:59 +01:00
Neil Fuller
c16f65807b Modify test now that LocalSocket.getSoTimeout() does something
Bug: 3106438
Change-Id: Iac7153607d5da44f21d66da80e2db27b17002d8d
2015-07-03 13:03:34 +01:00
Daniel Xie
2826264066 am 08a1d97c: am 47019e62: am 0406d150: am 1b8da7ba: am ed2905ca: am fba908c2: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e automerge: a011f00
* commit '08a1d97ca47c9572f785b3b59f5e4ec8c91c735d':
  Lookup private resources in run-time
2015-06-29 19:14:25 +00: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
Ang Li
dda68d2e2d Add CTS tests for passpoint APIs in enterprise config.
b/22001019

Change-Id: I35f6fa624f4b8fcd722296e12bc5aefc76ea96c6
2015-06-24 17:06:30 -07:00
Erik Kline
1c542daddb multinetwork native API CTS test
Bug: 19537384
Bug: 21833352
Change-Id: I03df80beca241fe3c952aae65de0cd081751de07
2015-06-24 18:10:07 +09:00
Neil Fuller
b38eedcb8f Remove cell / wifi manipulation from ApacheHttpClientTest
The testcase was manipulating the Wifi / Cell networks,
presumably in an effort to make data pass over each type of
network.

The test was sending / receiving data using the loopback
interface so it doesn't make much sense.

testExecute_withMobile would fail if the device did not
have a SIM / mobile data connection *and* if the wifi
network was up when the test ran; it would fail waiting
for the mobile data network to enter the CONNECTED state.
If the wifi connection was down at the start it would
assume the mobile data connection was up already and
proceed with the test (which passed, because it
didn't actually use the network).

This change chops out parts of this test to leave just
HttpClient-related code.

Bug: 21874093
Change-Id: I8248b840f58f939661eff2345f70a9e786e593f3
2015-06-19 14:25:39 +01:00
Daniel Xie
30f887a96a am 775eeca0: am 44bc7921: am d57ae212: am 8a37e0b3: am 48c2210b: am 4a4d6864: Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev
* commit '775eeca0205b87008bd21b1dd95be228870f5aee':
  Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class
2015-06-08 22:10:45 +00:00
Daniel Xie
8411eed10d am 8b93ce0f: (-s ours) DO NOT MERGE - resolved conflicts for merge of 97e88d58 to lmp-mr1-ub-dev
* commit '8b93ce0f73af7dd41abc1e7ac85cf0dda4eaeeb9':
  LocalSocketTest.testAccessors: fix the *SendBufferSize* test
2015-06-06 00:05:48 +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
d2e884590d am 35576979: am 93f50313: am 7f58cec6: am 762d1115: am be5ae9fb: am 95c40906: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 1840edc
* commit '3557697903ccd7058d4ff45e48d756247823edc4':
  Accept more than one SD in NsdManagerTest
2015-06-05 02:18:47 +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
Lorenzo Colitti
b1f33d49d0 Unbreak PingTest.
The test is failing because it expects ::1" to resolve to
"localhost", but it now resolves to "ip6-localhost".

Bug: 18791191
Bug: 19953381
Change-Id: I62279b6219c32e817253c686bf408f0a2fc1fa6b
2015-05-18 12:20:59 +09:00
Qiwen Zhao
59d433f5ea am 68e2a200: (-s ours) am b1c0b3b1: (-s ours) am cbdec383: (-s ours) DO NOT MERGE ANYWHERE.
* commit '68e2a200f23ef2a89616aa0753a49a878fd3c2e3':
  DO NOT MERGE ANYWHERE.
2015-03-30 18:42:55 +00: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