Commit Graph

272 Commits

Author SHA1 Message Date
Paul Jensen
22e42b48f5 resolved conflicts for 3e4042eb to mnc-dev
Change-Id: I3476d55641288b21a1609a8e72f37012d86bad03
2015-09-25 07:28:26 -04:00
Paul Jensen
3e4042eb78 am 063f9718: am 358b4b14: am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '063f971859d0ef5ac96b69de345cd94fd4788b7e':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 11:09:06 +00:00
Paul Jensen
063f971859 am 358b4b14: am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '358b4b140f9811667471596293fc1f5cfa2d536c':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 11:02:47 +00:00
Paul Jensen
358b4b140f am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '8c04baef4cb8066712c6b1af345781b41a17aa8a':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 10:57:05 +00:00
Paul Jensen
e287a5c6d8 Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev 2015-09-25 10:45:39 +00:00
Paul Jensen
45984684aa CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
Bug:21900139
Change-Id: Ib026bc4e66437f015729bdf7c923145ffa41fbde
2015-09-22 08:07:46 -04:00
JP Abgrall
740064e97f am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
* commit 'ab0f0fe884c280adcde0259f4692cebfb3d0bf08':
  Fix CTS build
2015-09-22 03:45:28 +00:00
Amith Dsouza
2d22fa9b07 am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
* commit '2e4ce593e3b6c611783bc660f95e2e783e004cd3':
  LocalSocketTest.testAccessors: fix the *SendBufferSize* test
2015-09-15 17:00:13 +00:00
Daniel Xie
624951463c am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
* commit '1840edcd80a4bc62bae117848ef64a5c4bf83ef2':
  Accept more than one SD in NsdManagerTest
2015-09-15 17:00:07 +00:00
Daniel Xie
f4efe32775 am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit 'e260657a086ed507a80e8809315d22495faa15e4':
  Support WiFi only device at runtime.
2015-09-12 00:31:35 +00:00
Daniel Xie
e260657a08 am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit '45643db78515be3603ad2a17244d21badfd89a25':
  Support WiFi only device at runtime.
2015-09-10 18:25:59 +00:00
Takayuki Hoshi
f8e2416639 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-09-10 04:41:04 +00:00
Unsuk Jung
bfd0aabaa5 am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit 'b8ad8a1a990597951faaf9e82722e628ff74c0e3':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-10 03:47:23 +00:00
Unsuk Jung
b8ad8a1a99 am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
* commit '17607b8a36287108099db71b9a15f20d64434203':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-09 22:19:06 +00:00
Erik Kline
f19c63e5b1 Add trivial retransmission of QUIC packets
Also:
    - correct use of strlcpy()
    - add some more logging

Bug: 21833352
Bug: 22181260
Change-Id: Id153e17b8d4d32a35d38846599aa51147739e163
2015-08-20 04:45:08 +09:00
Lorenzo Colitti
cfc277c7f1 Update CTS for unsupported legacy ConnectivityManager APIs
http://ag/736511 made the deprecated ConnectivityManager routing
APIs {start,stop}UsingNetworkFeature and requestRouteToHost throw
exceptions for apps whose target SDK version is 23 or above. Move
the tests for these APIs to a new APK that targets SDK version 22
and update the current test APK to ensure that they throw an
exception.

Bug: 22977863
Bug: 23003441
Bug: 23003635
Change-Id: Icf58e928fdc0018d977ce8aa315866659d32debb
2015-08-07 10:45:33 +09:00
Daniel Xie
b9453ff934 am 9417d728: am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit '9417d7288ddd37b5d2e347a724afb76cf987f70f':
  Support WiFi only device at runtime.
2015-08-06 05:11:27 +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
Jim Guggemos
b50470fcea Merge "New tests for (un)registerNetworkCallback with PendingIntent." into mnc-dev 2015-07-29 23:27:19 +00:00
Fyodor Kupolov
e57e9bcb96 Fix for ScanResultTest and WifiManagerTest
Added ACCESS_COARSE_LOCATION permission - it is now required to receive Wi-Fi
scan results(b/21852542).

Bug: 22790182
Change-Id: Idb72c200b08f7e4e95571504ab42c9e706f5c921
2015-07-29 11:24:34 -07: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
Jim Guggemos
9030d1aceb New tests for (un)registerNetworkCallback with PendingIntent.
Fixed up flakiness if WiFi was disabled before executing
the test.

Bug: 21833352
Change-Id: Ief7e12c4a7151722ec926ac38ced9f8903cdb607
2015-07-28 00:13:02 -06:00
Erik Kline
e2815d360a QUIC port 80 support is going away
Change-Id: I29a81e67d121b2e7e832e9e0d5e798d70b4c594a
2015-07-27 13:45:15 +09: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
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
Jim Guggemos
7443acfd8f New CTS test for ConnectivityManager.(un)registerNetworkCallback.
Tested on device with wifi enabled and disabled before
executing the test.

Bug: 21833352
Change-Id: I42222bd229a370f780f08fa056d331ff1431b87a
2015-07-16 17:46:58 -06:00
Jim Guggemos
708349cba6 New CTS test for ConnectivityManager.getActiveNetwork.
Bug: 21833352
Change-Id: I970a114e3c94c9885186bd55c608bbc4bcb9a7fa
2015-07-15 22:36:14 -06: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
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
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
2ee5bd54a5 Fix a naming error in WifiEnterpriseConfigTest.java
b/22349111

Change-Id: Ic9c847dfb1d58f274e91e22042c07995c72daa12
2015-07-08 13:45:14 -07: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
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
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
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