Commit Graph

1536 Commits

Author SHA1 Message Date
Roshan Pius
1cb86cc234 Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dev am: 2cbd46c060
am: 54ddf823b9

Change-Id: I0f8c02227cdf4d41c7e9f8b3a6b5bb2b81a382db
2017-06-20 04:15:05 +00:00
Roshan Pius
90453f5a22 Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dev am: 2cbd46c060
am: f1253618dd

Change-Id: Ic85667eccf735dcb458d3f1007558817948b80de
2017-06-20 04:12:02 +00:00
Roshan Pius
54ddf823b9 Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dev
am: 2cbd46c060

Change-Id: I9d0364acef9b989ae461e8241a3cd4d2e256c600
2017-06-20 04:07:32 +00:00
Roshan Pius
f1253618dd Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dev
am: 2cbd46c060

Change-Id: I1736f8f269ba2f4d53af9cd0a7c493d5adc99902
2017-06-20 04:07:32 +00:00
Roshan Pius
929683c04f WifiManagerTest: Set key mgmt field in testWifiManagerNetWork
By default |allowedKeyMgmt| is set to WPA_PSK, however the
|preSharedKey| is not set for this WifiConfiguration. So, the new
|validate| method added in ag/2339612, will reject the network update
(rightly so, because it's an invalid configuration). So, set the key
mgmt to |NONE| to indicate that this is an open network and hence does
not need the |preSharedKey| field.

Bug: 62418044
Test: Failing test passes now.
Change-Id: If979b909f2fb7d7b4e2626b57eff407ba6a019ab
(cherry picked from commit c7f4afa63708d898b7c0d0562b8b3ee3608114fe)
2017-06-19 21:13:11 +00:00
Chenbo Feng
b2b907c114 Merge "Add test to check sock addr in qtaguid ctrl file" am: 7f67f4521d am: 338fcfc742
am: 2738390adb

Change-Id: I6bdae98d42f3f04f06b59136897d097d74c7cfcd
2017-06-19 07:35:41 +00:00
Chenbo Feng
2738390adb Merge "Add test to check sock addr in qtaguid ctrl file" am: 7f67f4521d
am: 338fcfc742

Change-Id: Ie674dcb111e94c2cc52004cc6a4e83bcbadcc4ca
2017-06-19 07:30:13 +00:00
Chenbo Feng
da811bd336 Merge "Rename the native test file" am: 8867b298c4 am: 1f4f36b2af
am: b9591b1a27

Change-Id: I026e6e406d4b731e910035de2b75830b75d2d520
2017-06-19 06:17:06 +00:00
Chenbo Feng
b9591b1a27 Merge "Rename the native test file" am: 8867b298c4
am: 1f4f36b2af

Change-Id: Ic78ce912f1939823058420853d745f419a219b1a
2017-06-19 06:11:37 +00:00
Chenbo Feng
074684af96 Add test to check sock addr in qtaguid ctrl file
This test verifies the socket address information is not leaked by
xt_qtaguid module inside the kernel. The sock_addr parsed from
proc/net/xt_qtaguid/ctrl file should always be 0

Bug: 62489688
Test: in cts-tf: run cts --module CtsNativeNetTestCases

Change-Id: Ie9ed8aa604be7c6ae364baa69922b89c006dea72
2017-06-18 21:52:02 -07:00
Chenbo Feng
a9dabfefc8 Rename the native test file
Since more test is added to the qtaguid native test file, the previous
name is not suitable for representing the purpose of this test file.
Rename it to NativeQtaguidTest.cpp.

Bug: 62489688
Test: in cts-tf: run cts --module CtsNativeNetTestCases
Change-Id: Id64591db060c7d0178602517fd703dab586bfb5f
2017-06-18 20:30:51 -07:00
Android Build Merger (Role)
de5b1a0de0 Merge "Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3 am: cd62622f6d" into oc-dr1-dev-plus-aosp 2017-06-16 00:28:32 +00:00
Sudheer Shanka
004b9b0370 Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3
am: cd62622f6d

Change-Id: Icf55eb2474f82b6926f2392fa9cea0b126b83def
2017-06-16 00:26:01 +00:00
Sudheer Shanka
50a0d24df6 Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3
am: 699a587e1c

Change-Id: Ifb3df8ea58c5a5a25a03d01ed58a731557f0f8aa
2017-06-16 00:26:00 +00:00
Sudheer Shanka
699a587e1c Merge "Catch Throwable instead of Exception." into oc-dev
am: fff08f9ad3

Change-Id: I399e9224f3c0db1b2c30218d04f21789cc53fad9
2017-06-16 00:20:04 +00:00
Sudheer Shanka
cd62622f6d Merge "Catch Throwable instead of Exception." into oc-dev
am: fff08f9ad3

Change-Id: Icfeb980db876fe2c73f86e4982429b6b94bfc08a
2017-06-16 00:19:59 +00:00
Sudheer Shanka
e0ea4b74fb Catch Throwable instead of Exception.
AssertionFailedError is a Throwable and hence some logs which will
help debug the failures are not printed.

Bug: 38384021
Test: Verified that when the test throws AssertionFailedError, required
      logs are printed.

Change-Id: I6cc8e0172b8e30d268a50bdf9281d6828fc74810
2017-06-15 11:43:42 -07:00
Roshan Pius
d668fbd802 Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dr1-dev
am: fdb0a13a76

Change-Id: I653899bcd5b92744aadd8feb906550fc53404f4a
2017-06-13 21:46:04 +00:00
TreeHugger Robot
fdb0a13a76 Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dr1-dev 2017-06-13 21:34:07 +00:00
Android Build Merger (Role)
5a184b6572 Merge "Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev am: 1f29891f4b am: 3253a61143" into oc-dr1-dev-plus-aosp 2017-06-12 19:25:01 +00:00
Sudheer Shanka
e9929a02a4 Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev am: 1f29891f4b
am: 3253a61143

Change-Id: I3e2d228bf3c43ba912fb9d8858476b6cb05abcdc
2017-06-12 19:23:48 +00:00
Sudheer Shanka
4b6e29853d Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev am: 1f29891f4b
am: d6c990a6da

Change-Id: I96b1249b85664e9824c2d3751c15f91e76bd239b
2017-06-12 19:23:25 +00:00
Sudheer Shanka
3253a61143 Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev
am: 1f29891f4b

Change-Id: If5610c7effe42388bae9e48dc5e081e96346dca4
2017-06-12 19:18:37 +00:00
Sudheer Shanka
d6c990a6da Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev
am: 1f29891f4b

Change-Id: I413f470b6397dabde6e027c21792e8cfc52e2077
2017-06-12 19:18:33 +00:00
Sudheer Shanka
1f29891f4b Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev 2017-06-12 19:13:53 +00:00
Andreas Gampe
adb8ebcad1 Merge "CTS: Suppress -Wunused-parameter" am: 795ee24c1a am: 66d0291855
am: b00ce3cee7

Change-Id: I353d707e17251fe03b898b2ca45ba1875e64c5da
2017-06-09 16:07:50 +00:00
Andreas Gampe
b00ce3cee7 Merge "CTS: Suppress -Wunused-parameter" am: 795ee24c1a
am: 66d0291855

Change-Id: Ifa4224cfc63fc153234a73b3dc31041e347d72bb
2017-06-09 16:02:28 +00:00
Treehugger Robot
795ee24c1a Merge "CTS: Suppress -Wunused-parameter" 2017-06-09 15:51:03 +00:00
Andreas Gampe
ee1fcef3a1 CTS: Suppress -Wunused-parameter
Suppress unused-parameter warnings to lower build-time spam.

Bug: 18632512
Test: mmma cts
Change-Id: I2af0a9b0009e91415f87a397611d716567fbb16b
2017-06-08 21:12:51 -07:00
Sudheer Shanka
2f54af49ae Try to fix HostsideRestrictBackgroundNetworkTests flakyness again.
- Add some logging to dump usage stats if setting an app as inactive
fails.

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

Change-Id: I96d7acabcf3dc18b4187775bbd2bce17a49dbb7b
2017-06-08 17:17:07 -07:00
Roshan Pius
eb0e095e16 WifiManagerTest: Set key mgmt field in testWifiManagerNetWork
By default |allowedKeyMgmt| is set to WPA_PSK, however the
|preSharedKey| is not set for this WifiConfiguration. So, the new
|validate| method added in ag/2339612, will reject the network update
(rightly so, because it's an invalid configuration). So, set the key
mgmt to |NONE| to indicate that this is an open network and hence does
not need the |preSharedKey| field.

Bug: 62418044
Test: Failing test passes now.
Change-Id: If979b909f2fb7d7b4e2626b57eff407ba6a019ab
2017-06-08 20:35:01 +00:00
Guang Zhu
09004e2a44 Merge "add component metadata to all CTS module configs" into oc-dev am: 43596249b5
am: 55d3388eb4  -s ours

Change-Id: I08c7a1739acb7427391cff630b2fdbdec071cf1d
2017-06-06 19:40:18 +00:00
Guang Zhu
55d3388eb4 Merge "add component metadata to all CTS module configs" into oc-dev
am: 43596249b5

Change-Id: Idaada8414d62bf7d84d40b532ec7464e7230bd37
2017-06-06 19:29:09 +00:00
Guang Zhu
1d0e04c472 add component metadata to all CTS module configs
Bug: 36140955
Bug: 35360169
Test: new unit test to ensure that all modules have this field
Change-Id: Ie76e4306049eb56e7f4360f63093ab03b3ca2611
Merged-In: Id856f93c0d2a018be65bff33459b4b703d23257d
2017-06-05 23:20:19 +00:00
Guang Zhu
dd8918c80b add component metadata to all CTS module configs
Bug: 36140955
Bug: 35360169
Test: new unit test to ensure that all modules have this field
Change-Id: Id856f93c0d2a018be65bff33459b4b703d23257d
2017-06-05 16:15:37 -07:00
Guang Zhu
020b01857f Merge "Update configurations to avoid using ApkInstaller" into oc-dev am: aeace3fce9
am: f8307035e0  -s ours

Change-Id: Icb3e0820ebbaad36f3a16bf2353fb581ba5ecf50
2017-06-02 17:00:27 +00:00
Guang Zhu
f8307035e0 Merge "Update configurations to avoid using ApkInstaller" into oc-dev
am: aeace3fce9

Change-Id: Ie26c681cc30a16030ed27ae662d0fac8ede1cdbc
2017-06-02 16:53:38 +00:00
jdesprez
b8c1c24ad4 Update configurations to avoid using ApkInstaller
- use the new tradefed version of it.
- add a tests to check configs.

Test: build, run collect-tests-only dry-run
Bug: 37213493
Change-Id: I45e9950aa2731afe9403dd44dd18d0a8d40fdb6b
Merged-In: Ia212b707befe3ffc70ef43cbc292e97be3f364f1
2017-06-01 19:50:57 -07:00
Sudheer Shanka
6cf111906e Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness." into oc-dev am: 771cf7a71d
am: 5003ee82fc

Change-Id: I3816346cb5c2a3495a769ea97eefdd8223e84cfe
2017-06-01 07:00:38 +00:00
Sudheer Shanka
5003ee82fc Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness." into oc-dev
am: 771cf7a71d

Change-Id: I84f484f2e009f60a0582d60dd0c7f31b14e3a1c8
2017-06-01 06:55:42 +00:00
Sudheer Shanka
6eef88a6cd Try to fix HostsideRestrictBackgroundNetworkTests flakyness.
Bug: 38384021
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I99668396abcf7421cd7ffb9118e309aaecb80f07
2017-05-31 15:53:31 -07:00
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
Hugo Benichi
3571a6f6f2 Merge "Update CTS tests to reflect ConnectivityManager API changes." am: 54a417d822 am: 1fd5b6b9a3 am: c0411a3a52
am: 10deb8e493

Change-Id: I4c6a51c979b6db7d7921be73a95f8171d3f7d0af
2017-05-19 23:45:23 +00:00
Hugo Benichi
10deb8e493 Merge "Update CTS tests to reflect ConnectivityManager API changes." am: 54a417d822 am: 1fd5b6b9a3
am: c0411a3a52

Change-Id: I8d3f5479bb4a4a8fabe45974898ff2dac0e76332
2017-05-19 23:34:51 +00:00