Commit Graph

228 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Filip Matusiak
970cbe09b5 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
2015-01-19 10:50:52 +01:00
Neil Fuller
0e8136c081 am 40025ba8: Merge "Add HttpResponseCacheTest as a CTS test"
* commit '40025ba80bd80dce16dea980af04f040194c9b69':
  Add HttpResponseCacheTest as a CTS test
2015-01-15 17:05:50 +00:00
Neil Fuller
51130c9726 Add HttpResponseCacheTest as a CTS test
Moving HttpResponseCacheTest.java from
frameworks/base/core/tests/coretests/src/android/net/http
to
cts/tests/tests/net/src/android/net/http/cts

And making it work in the CTS runner by setting
temp directory permissions and making sure the
cache is initialized.

Change-Id: I032014789f27a66c1a7a0aee0fa0494f6041238e
2015-01-15 16:51:48 +00:00
Erik Kline
13014fc7f8 am 77b855a1: Merge "Consider VPN always to be a supported type." into lmp-mr1-dev
* commit '77b855a1a832eda78888a2b04e23722c9ca093ab':
  Consider VPN always to be a supported type.
2015-01-08 02:14:59 +00: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
12aeba8bfb am 78271a94: Merge "Test TCP and ICMPv6 on VPNs in addition to UDP." into lmp-mr1-dev
* commit '78271a94b07e235f2d5213516b75c5bf1d4c87ab':
  Test TCP and ICMPv6 on VPNs in addition to UDP.
2014-12-18 14:59:49 +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
Narayan Kamath
0e87f2b861 Track changes to Posix.* API.
We need to flip() the byte buffer before attempting to read
the data written to it.

bug: 18641009

(cherry picked from commit 96f656c39e)

Change-Id: Ib796fafa1e4cf81351245fff6763ce17924acde9
2014-12-15 17:09:44 +00:00
Wei Liu
43712feaea am 5747d9c5: am 913b9943: Skip testDnsWorks if the active network for watch is proxy.
* commit '5747d9c5e39bf3588ab7eacf839ec4752b9fd04f':
  Skip testDnsWorks if the active network for watch is proxy.
2014-12-12 14:42:10 +00: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
5e56812105 am 85e4fa7e: Merge "Track changes to Posix.* API." into lmp-mr1-dev
* commit '85e4fa7e663b59a2232c46c1a8040df6e587187e':
  Track changes to Posix.* API.
2014-12-10 22:22:09 +00: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
2bcdb6dd89 am b79b5e8d: Merge "Add a CTS test for the VPN API." into lmp-mr1-dev
* commit 'b79b5e8d868cdf28f7edd1b7e37dc380df43a91f':
  Add a CTS test for the VPN API.
2014-12-03 20:42:03 +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
Alex Klyubin
3ae1307929 am 3d751e1d: Merge "Fix build breakage due to SSLDefaultConfigurationAsserts rename."
* commit '3d751e1d9cc61452f10e6300be8c42191eb6ae54':
  Fix build breakage due to SSLDefaultConfigurationAsserts rename.
2014-11-19 05:00:34 +00:00
Alex Klyubin
5bba35cb16 Fix build breakage due to SSLDefaultConfigurationAsserts rename.
libcore's SSLDefaultConfigurationAsserts was renamed and refactored
into SSLConfigurationAsserts in
782740701db73dd2dc4fef9df8cde270b0e631a4. This CL adjusts the
affected CTS test for android.net.SSLCertificateSocketFactory
accordingly.

Change-Id: I663042e7c08ad616b2dedc226acda54c95fd6968
2014-11-18 20:15:25 -08:00
Vinit Deshpande
b93e3fd9eb am 6c2fd407: am 2cd469db: am 255ca5b2: Merge "Remove enableNetwork(netId, disableOthers) check from CTS" into lmp-dev
* commit '6c2fd407ea35c60ee610d75480ff06640820370b':
  Remove enableNetwork(netId, disableOthers) check from CTS
2014-10-24 18:05:54 +00:00
Vinit Deshpande
a128d843f4 am 2e03a088: am 5047f2aa: am 161f55f2: Merge "Relax NsdManagerTest\'s duplicate event check" into lmp-dev
* commit '2e03a0883c9d34bc8ac6f42874e3cb1fd7507e57':
  Relax NsdManagerTest's duplicate event check
2014-10-24 18:05:52 +00: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
4dad4c63c7 am 93c30693: am 0d1bad9c: Merge "Add cts test for wifi scan timestamp." into lmp-dev
automerge: 3c4d00b

* commit '3c4d00b0469f543da6b82b24e9270509c12ea70d':
  Add cts test for wifi scan timestamp.
2014-10-18 01:08:10 +00:00
Wei Wang
997750dae9 am 0d1bad9c: Merge "Add cts test for wifi scan timestamp." into lmp-dev
* commit '0d1bad9c05da8c3e1385009cad2ba73cff64c359':
  Add cts test for wifi scan timestamp.
2014-10-18 00:49:18 +00: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
447139ee2f am 3841975e: am 831e438b: Merge "Build CTS tests as multilib apks" into lmp-dev
* commit '3841975e258b5eabd8fbdb5e0ecda5648f392d7f':
  Build CTS tests as multilib apks
2014-10-10 16:58:34 +00:00