Commit Graph

727 Commits

Author SHA1 Message Date
Sudheer Shanka
9be01aa5e7 Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness." into oc-dev am: c7e8f9091f
am: 5826bd464d

Change-Id: Ieb774613ded8bd6763cee03aeaba2ce79df72113
2017-05-26 19:18:34 +00:00
Sudheer Shanka
5826bd464d Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness." into oc-dev
am: c7e8f9091f

Change-Id: Ie9e4b5835a0297fd2d7cdb71d230f7833cd6b265
2017-05-26 19:12:54 +00:00
Sudheer Shanka
c7e8f9091f Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness." into oc-dev 2017-05-26 19:06:28 +00:00
Sudheer Shanka
43353038f0 Try to fix HostsideRestrictBackgroundNetworkTests flakyness.
- If the screen is not turned on when the activity is starting, then
  that process will be in TOP_SLEEPING state and won't have temp access
  to network connectivity in restricted modes. So, add a wait time after
  turning the screen on.
- Increase the timeout for app standby wait time.

Bug: 38384021
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I54563a0c8b3e783ee9279d667faa5cab529ddc7e
2017-05-25 16:43:22 -07:00
Rebecca Silberstein
6ae2354903 Merge "WifiManagerTest: add LOHS tests" into oc-dev am: fbad021a0e
am: f5bd5f56e1

Change-Id: I97743bb80cceff4b30df97b1bac3a5d0f3448d3b
2017-05-25 20:28:23 +00:00
Rebecca Silberstein
f5bd5f56e1 Merge "WifiManagerTest: add LOHS tests" into oc-dev
am: fbad021a0e

Change-Id: I327caa53dd3bb782c9f2f6dbe7cdef913187de43
2017-05-25 20:17:29 +00:00
Rebecca Silberstein
a7bd5947b6 WifiManagerTest: add LOHS tests
Add new CTS tests for the LocalOnlyHotspot feature.  This CL also
creates a reusable method for confirming that wifi is enabled via the
setWifiEnabled call.  This should reduce flake in automated test runs by
setting local variables before wifi is enabled instead of after the
call.  This change removes a race condition on confirming if wifi is
enabled.

Bug: 31466854
Test: ran new CTS tests
Test: no new failures with 'run cts-dev --module CtsNetTestCases -t ran n
android.net.wifi.cts.WifiManagerTest'

Change-Id: Id119170fea742402dda10d83014d27b8dbc98e92
2017-05-24 15:57:47 -07:00
Roshan Pius
01fdb38e78 Merge "cts(wifi): Fix WifiManager.testWifiManagerActions" into oc-dev am: b061da6df9
am: 537b65a753

Change-Id: I11bcbc7ff5e1f81b5ea83339f0d267f6090675bd
2017-05-18 19:24:45 +00:00
Roshan Pius
537b65a753 Merge "cts(wifi): Fix WifiManager.testWifiManagerActions" into oc-dev
am: b061da6df9

Change-Id: I484922ca86154aa470f6231f344b7ea1986d6253
2017-05-18 19:19:11 +00:00
TreeHugger Robot
b061da6df9 Merge "cts(wifi): Fix WifiManager.testWifiManagerActions" into oc-dev 2017-05-18 19:13:12 +00:00
Peter Qiu
6f8ed75068 Merge "wifi: hotspot2: remove usage of hidden Passpoint APIs" into oc-dev am: 8a16ce5a11
am: 546b8af6c8

Change-Id: I85ec7eeb5431584f8a52c7cfd156d96dcb6861cc
2017-05-18 19:05:50 +00:00
Peter Qiu
546b8af6c8 Merge "wifi: hotspot2: remove usage of hidden Passpoint APIs" into oc-dev
am: 8a16ce5a11

Change-Id: Iea86ccce2d9635ad5f388310754e688f8adc6345
2017-05-18 18:57:42 +00:00
TreeHugger Robot
8a16ce5a11 Merge "wifi: hotspot2: remove usage of hidden Passpoint APIs" into oc-dev 2017-05-18 18:49:06 +00:00
Roshan Pius
4e474bccdb cts(wifi): Fix WifiManager.testWifiManagerActions
The current assertion in the test is incorrect. When we disable wifi,
we should expect scans to pass if location scans are turned on, else
scans should fail.

Also, reset mScanResults in startScan so that it doesn't contain stale
scan results.

Bug: 38224452
Test: Run the cts test with both location scan turned on & off.
`cts-tradefed run cts-dev --module CtsNetTestCases -t
android.net.wifi.cts.WifiManagerTest#testWifiManagerActions`

Change-Id: I27bc88ca4883d9233da9e911397192a1eef4422b
2017-05-18 09:57:50 -07:00
Chenbo Feng
28ef60358e Merge "Native test for qtaguid module" am: 77a4431748 am: 9fee7c90d6 am: 70043d4530
am: 4b90507fea

Change-Id: I3bde13afbafa43849bc7f1d41232c33b6234cb1c
2017-05-16 18:22:58 +00:00
Chenbo Feng
4b90507fea Merge "Native test for qtaguid module" am: 77a4431748 am: 9fee7c90d6
am: 70043d4530

Change-Id: I59f03fa2dc4068e3e70822570552927e383d78b5
2017-05-16 17:59:36 +00:00
Chenbo Feng
bc0e94a4a3 Native test for qtaguid module
Add a native test to check the qtaguid module nolonger hold the fd of a
closed socket. The test does not work in java because android framework
will force untag the socket before closing it.

Bug: 36374484
Test: run this test as CTS test and all devices should pass
Signed-off-by: Chenbo Feng <fengc@google.com>
Change-Id: I9e015d412d1aec10d843dfee4b480169d1f6ff8e
2017-05-15 23:16:35 -07:00
Sudheer Shanka
8f9a2d7396 Merge "Add cts to test power-save-except-idle whitelist is correctly used." into oc-dev am: e60355110f
am: e62bec2dde

Change-Id: Ifbbf1eae790c98171435ec09e79838cfdbb9e8ba
2017-05-15 18:28:14 +00:00
Sudheer Shanka
e60355110f Merge "Add cts to test power-save-except-idle whitelist is correctly used." into oc-dev 2017-05-15 18:15:32 +00:00
Peter Qiu
775da2fee6 Merge "wifi: fix testWifiManagerActions test failure" into oc-dev am: 3c3054ec78
am: 9600a8ce96

Change-Id: Ia5d5dbdb9699f523e890f56c72d0f25ca981c633
2017-05-04 21:03:46 +00:00
Peter Qiu
af75a22435 wifi: fix testWifiManagerActions test failure
WifiManager#pingSupplicant is deprecated and its semantics had changed.
So remove it in testWifiManagerActions to fix the test.

Bug: 37991667
Test: cts-tradefed run cts-dev --module CtsNetTestCases --test
      android.net.wifi.cts.WifiManagerTest#testWifiManagerActions

Change-Id: I9b64cb6d03c253f143a78caca72b75678973034b
2017-05-04 11:31:04 -07:00
Peter Qiu
d11e41a322 wifi: hotspot2: remove usage of hidden Passpoint APIs
The APIs for Release 2 configuration are now hidden,
so remove the usage of those APIs.

Also use a trusted public certificate instead of a fake
one for testing Release 1 configuration,  since it will
be verified by WifiService when adding a Release 1 configuration.

Bug: 37907977
Test: cts-tradefed run cts-dev --module CtsNetTestCases --test android.net.wifi.cts

Change-Id: Ie1056b97da1597ff1cdc979e9c2a57f19f58e0a3
2017-05-04 10:24:37 -07:00
Sudheer Shanka
740f0e1b43 Merge "Fix CtsHostsideNetworkTests." into oc-dev am: 569fdfd845
am: d5132c6e6c

Change-Id: Ib0759cd07e9a5fc0c9a7a0edf682deae07c567c9
2017-05-02 05:22:30 +00:00
Sudheer Shanka
569fdfd845 Merge "Fix CtsHostsideNetworkTests." into oc-dev 2017-05-02 05:12:53 +00:00
Jeff Sharkey
f7ecc23326 Merge "Merge "wifi: update method name for timestamp related APIs" into oc-dev am: 15f09b5d64" into oc-dev-plus-aosp
am: de3abfb256

Change-Id: I50a4a8ea00e5e45d5a662ce32260cdc8f3c69238
2017-05-01 22:20:25 +00:00
TreeHugger Robot
cbf124e9c5 Merge "cts: Add all tests to general-tests" 2017-05-01 21:31:48 +00:00
Sudheer Shanka
679887f66a Add cts to test power-save-except-idle whitelist is correctly used.
Bug: 37670935
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I03619bec15e14707ab103c77feab08d3520a2914
2017-05-01 14:29:56 -07:00
Sudheer Shanka
7655b694ec Fix CtsHostsideNetworkTests.
The changes made to ensuring network connectivity on app start
only applies to activities. There is no change in how the services
are handled.

Bug: 27803922
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: Ib82b07195e395c89701dd525b850c0935d94dfe7
2017-05-01 11:55:53 -07:00
Peter Qiu
7359ffec6e wifi: update method name for timestamp related APIs
Bug: 37514629
Test: build
Change-Id: I090bc8049e534ef8811104f732fa4183ba87603f
2017-05-01 09:37:36 -07:00
Lorenzo Colitti
ad907688cd Merge "Update CTS tests to reflect ConnectivityManager API changes." into oc-dev am: 6a25ed09f9
am: c440c73ac2

Change-Id: I9e070fda621fe50886686fba04e51fb9d0ad05af
2017-04-28 04:12:40 +00:00
Lorenzo Colitti
6a25ed09f9 Merge "Update CTS tests to reflect ConnectivityManager API changes." into oc-dev 2017-04-28 03:58:10 +00:00
Lorenzo Colitti
b58d8aa66a Update CTS tests to reflect ConnectivityManager API changes.
Bug: 36370941
Test: marlin-eng builds
Change-Id: Icb127e468698711669ecc2c2002ff8add56700e0
2017-04-28 09:34:06 +09:00
nharold
0644afc7d6 Merge "Remove IpSecManagerTest" am: 55fb32fd9f am: db56f31e31 am: 027d1c8557
am: 0548788841

Change-Id: Ib475b44994dffd55eddcccdcbc5617927e3ffdf8
2017-04-26 17:53:02 +00:00
nharold
0548788841 Merge "Remove IpSecManagerTest" am: 55fb32fd9f am: db56f31e31
am: 027d1c8557

Change-Id: Iae0b6fab34aeaf698e182a91256f97557a568cb4
2017-04-26 17:37:29 +00:00
Nathan Harold
c75b01f03e Remove IpSecManagerTest
IpSecManager and its associated classes are removed from OC.
They are planned for a future release.

Bug: 37681043
Test: make cts
Change-Id: I2ff911d5c62dbbf9be699330742d041706d9cbc2
Merged-In: I2ff911d5c62dbbf9be699330742d041706d9cbc2
(cherry picked from commit 3a51173a3a762b576dd3c0d29c883e8763a9f95b)
2017-04-25 16:53:33 -07:00
Nathan Harold
18b7c24177 Remove IpSecManagerTest
IpSecManager and its associated classes are removed from OC.
They are planned for a future release.

Bug: 37681043
Test: make cts
Change-Id: I2ff911d5c62dbbf9be699330742d041706d9cbc2
2017-04-25 16:33:29 -07:00
Etan Cohen
6ae63d613c Merge "[AWARE] Rename destroy() method to close()" into oc-dev 2017-04-25 03:26:04 +00:00
Simran Basi
d98ea4bc2a cts: Add all tests to general-tests
Adds all the cts tests to general-tests so they can will
be included in the general-tests.zip file.

This cl was generated using the following command:
master/cts$ grep -rl "LOCAL_COMPATIBILITY_SUITE := cts" . | \
xargs sed -i \
's/LOCAL_COMPATIBILITY_SUITE := cts/LOCAL_COMPATIBILITY_SUITE := cts general-tests/g'

Bug: None
Test: make general-tests -j
Change-Id: Idbddf1560a31961cb2e6cab8cf55b55e22ecbbff
2017-04-24 12:28:16 -07:00
Etan Cohen
2fa28c39ae [AWARE] Rename destroy() method to close()
Aware classes with destroy() methods (containing resources)
converted to be AutoCloseable. As such the destroy method
was renamed.

Bug: 37514387
Test: unit tests and integration (sl4a) tests passing.
Merged-In: I433d7cf6f4c60bab4230702075ea22b9c56f31af
Change-Id: I433d7cf6f4c60bab4230702075ea22b9c56f31af
2017-04-21 14:05:45 -07:00
Etan Cohen
8a4b23b729 [AWARE] Rename destroy() method to close()
Aware classes with destroy() methods (containing resources)
converted to be AutoCloseable. As such the destroy method
was renamed.

(cherry-pick of commit c9f0f4c6c72fa3952b54d40714343be0988e97ef)

Bug: 37514387
Test: unit tests and integration (sl4a) tests passing.
Change-Id: I433d7cf6f4c60bab4230702075ea22b9c56f31af
2017-04-21 13:16:15 -07:00
Sudheer Shanka
ae4a548268 Merge "Revert "Relax the check of network availability in CtsHostsideNetworkTests."" into oc-dev am: 6ec7be5f3c
am: 4ae5e1d2a1

Change-Id: I463fcb144e9a07d6bb4d75bbd7235563879901b6
2017-04-21 02:13:44 +00:00
Sudheer Shanka
99ec4c0d91 Revert "Relax the check of network availability in CtsHostsideNetworkTests."
This reverts commit 863ec4b9cb.

Bug: 27803922
Change-Id: I3ccf33779df580ed615f44d0410676cba972ea6c
2017-04-19 17:36:32 +00:00
Nathan Harold
d017754253 Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev 2017-04-19 00:36:18 +00:00
nharold
15a9d5b740 Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16 am: 335800627b am: bd6d169a27
am: 33a246829e

Change-Id: Ic2aa4b9e5bd48f8067a2132aa361e4f1f89f3fd0
2017-04-18 22:22:23 +00:00
nharold
33a246829e Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16 am: 335800627b
am: bd6d169a27

Change-Id: I30fdb54469197c040cc5ad2e91bde4e9a9e86d41
2017-04-18 22:10:17 +00:00
Nathan Harold
372975ecb2 Remove DatagramSocket calls from IpSecManagerTest
Because the DatagramSocket version of the API is being
hidden, this test is being converted to use the
FileDescriptor version of applyTransportModeTransform()
and removeTransportModeTransform()

Bug: 37446006
Test: compilation
Merged-In: Ida4977a6e7496ce6b4de38bfd48bd6a162cab874
Change-Id: Ida4977a6e7496ce6b4de38bfd48bd6a162cab874
(cherry picked from commit 8e0db4ceaa9b2940942132e452d44cd59ff971e2)
2017-04-17 22:04:36 -07:00
Nathan Harold
f20fc80ba5 Remove DatagramSocket calls from IpSecManagerTest
Because the DatagramSocket version of the API is being
hidden, this test is being converted to use the
FileDescriptor version of applyTransportModeTransform()
and removeTransportModeTransform()

Bug: 37446006
Test: compilation
Change-Id: Ida4977a6e7496ce6b4de38bfd48bd6a162cab874
2017-04-17 22:01:26 -07:00
Sudheer Shanka
712aa0495b Merge "Skip data saver related tests if the device doesn't support it." into oc-dev am: a61bc6a566
am: 21ec60f4db

Change-Id: Ifeb83797fc6c22fd735b9a1346941b49a651764c
2017-04-18 04:33:56 +00:00
Sudheer Shanka
a61bc6a566 Merge "Skip data saver related tests if the device doesn't support it." into oc-dev 2017-04-18 04:23:20 +00:00
Tina Zhou
e824fd5c0b Merge "Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f" am: 0a33006809 am: 6012fe12dc am: aeb1d2f1cf
am: 293d94f734

Change-Id: Ia53d7e9f8c256154e121773d7d23c8a4c3895192
2017-04-17 18:03:16 +00:00