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
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
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
Wei Wang
9532aa5f86
am 997750da: am 0d1bad9c: Merge "Add cts test for wifi scan timestamp." into lmp-dev
...
* commit '997750dae94d65317b9362d8f1f04811c1b37842':
2014-10-23 13:18:40 +00:00
Unsuk Jung
dd8143d79c
am 615d7839: am 831e438b: Merge "Build CTS tests as multilib apks" into lmp-dev
...
* commit '615d78399d3c2936db113a61a3f9804fdd3f597b':
2014-10-23 13:16:34 +00:00
Paul Jensen
61bb387679
am 581a02c8: am c3486218: Merge "Update CTS ConnectivityManager tests to work with L release." into lmp-dev
...
* commit '581a02c865105863671503e6b245945857c716ea':
2014-10-23 13:12:40 +00: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
Unsuk Jung
615d78399d
am 831e438b: Merge "Build CTS tests as multilib apks" into lmp-dev
...
* commit '831e438ba317402e19415f157cbe7d9c93c4f9ad':
Build CTS tests as multilib apks
2014-10-09 12:51:27 +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
6aa130c992
am c3486218: Merge "Update CTS ConnectivityManager tests to work with L release." into lmp-dev
...
* commit 'c34862184cfc47596f47088759ffac6ccb0b0b6c':
Update CTS ConnectivityManager tests to work with L release.
2014-10-01 01:42:09 +00:00
Paul Jensen
581a02c865
am c3486218: Merge "Update CTS ConnectivityManager tests to work with L release." into lmp-dev
...
* commit 'c34862184cfc47596f47088759ffac6ccb0b0b6c':
Update CTS ConnectivityManager tests to work with L release.
2014-09-29 20:48:30 +00: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
Elliott Hughes
28401b2607
am 4c01e968: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test"
...
* commit '4c01e96840853caca9abfb375a828b27f89022fb':
LocalSocketTest.testAccessors: fix the *SendBufferSize* test
2014-09-05 15:43:08 +00:00
Elliott Hughes
4c01e96840
Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test"
2014-09-05 05:42:25 +00:00
Constantin Musca
39f61377a5
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 use a larger value.
Bug: 16442451
Change-Id: I2d89393b1ad441783c8a082b072a806b8901830c
Signed-off-by: Constantin Musca <constantin.musca@intel.com >
2014-09-05 05:42:10 +00:00