Commit Graph

390 Commits

Author SHA1 Message Date
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
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
Stuart Scott
314bc8c0e6 Merge "Split the build of the CTS infrastructure from the tests." 2015-02-13 17:26:26 +00:00
Stuart Scott
1c67736dfe Split the build of the CTS infrastructure from the tests.
This allows developers to build the test packages individually without
needing to build the entire CTS release.

Add new build target for support packages

bug: 18945639
Change-Id: I60b79797b2d254b96aa98f88cfd5b19d195ea982
2015-02-12 10:04:26 -08:00
Narayan Kamath
505728b35a Add explicit dependencies on org.apache.http.legacy
Test modules that depend on the CTS testserver must declare
explicit dependencies on org.apache.http.legacy.

Also fix some bizarre build rules; ctstestserver builds directly
against the framework but compiled into apps that target SDK 16.

bug: 18027885

Change-Id: I905942d8ed71812499df94e3e5970c0b08716528
2015-02-06 13:56:30 +00: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
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
40025ba80b Merge "Add HttpResponseCacheTest as a CTS test" 2015-01-15 16:52:57 +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
Narayan Kamath
8ddaa5e861 am 977f75ec: Merge "Track changes to Posix.* API."
* commit '977f75ecbbdfa3a4b0bf07b498932f28a05e771e':
  Track changes to Posix.* API.
2014-12-18 21:49:43 +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
977f75ecbb Merge "Track changes to Posix.* API." 2014-12-15 17:11:46 +00: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
3d751e1d9c Merge "Fix build breakage due to SSLDefaultConfigurationAsserts rename." 2014-11-19 04:52:57 +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