Commit Graph

1424 Commits

Author SHA1 Message Date
Lorenzo Colitti
c324d8efcc Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42
am: 929efe5914

Change-Id: Id08eca6a250dee0c809267b7e3c79b9bb7170f3b
2017-08-09 16:47:20 +00:00
Lorenzo Colitti
d4df358e42 Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9
am: 80c62eb79b

Change-Id: Iee5219bc701a3049340d49f4fb33cc1340325957
2017-08-09 16:35:45 +00:00
Lorenzo Colitti
80c62eb79b Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev
am: bfabfe75f9

Change-Id: If02ea4f12870acb3e5e1bce9e9ddbc42c0fd05f0
2017-08-09 16:29:49 +00:00
Treehugger Robot
bfabfe75f9 Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev 2017-08-09 16:17:22 +00:00
Etan Cohen
ba1f56050f [AWARE][CTS] Check for location setting for test needing to disable Wi-Fi
Disabling Wi-Fi API which is available to CTS only disables the
infrastructure mode (association to an AP). This disables the Wi-Fi
chip (HAL/driver/firmware) only if location scanning is disabled,
otherwise the chip is still enabled.

The failing CTS Wi-Fi Aware test relied on disabling the Wi-Fi chip.
This cannot be done from CTS. Added a check for location scan setting
and skip the test if enabled.

Cannot fail and require the tester to disable location scans since other
CTS tests require it to be enabled.

Bug: 64125460
Test: run cts with and without location scans
Change-Id: I0582926dbf854c14b57dcdeb383db9b5f2a353a2
2017-07-28 22:30:33 +00:00
Chenbo Feng
3f96549bd1 Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9
am: 579e5eb386

Change-Id: I455baf9fb0b6db676a5a8a11971001f6aa57eddd
2017-07-18 18:55:49 +00:00
Chenbo Feng
907ef28ed9 Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab
am: 120ebca195

Change-Id: I19d5cb4167cda461b439a6d17cd1bca9521da222
2017-07-18 18:35:41 +00:00
Chenbo Feng
120ebca195 Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1
am: 0545b99cab

Change-Id: Id42297c51419c1c6cfe35222648b66015c3e8887
2017-07-18 18:25:17 +00:00
Chenbo Feng
0545b99cab Resolve merge conflicts of 2ce31b513f to nyc-dev
am: 3d166665b1

Change-Id: I218debd55328e87f59aaa387d0ebf4520787bc82
2017-07-18 18:14:42 +00:00
Chenbo Feng
f68fa658b6 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60
am: 18449e5999

Change-Id: I56fe33eed13a8cdaa5078ca6b0e221dd37f18b44
2017-07-18 16:56:57 +00:00
Chenbo Feng
b67b237853 resolve merge conflicts of 921e4b7e1c to oc-dev
Test: I solemnly swear I tested this conflict resolution.
      run cts --module CtsNativeTestCases

Change-Id: I4c8764a00d30ab7ff94eff07870ec79c7d7bc67d
2017-07-17 21:54:20 -07:00
Chenbo Feng
3d166665b1 Resolve merge conflicts of 2ce31b513f to nyc-dev
Merged-In: Ie9ed8aa604be7c6ae364baa69922b89c006dea72

Test: I solemnly swear I tested this conflict resolution.

Bug: 62489688
2017-07-17 22:34:13 +00:00
Chenbo Feng
6bff534f60 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834
am: 4b7b9dd4ab

Change-Id: Ic0264bee4a49e54159b0251920d8481a6fbd1152
2017-07-17 21:26:53 +00:00
Chenbo Feng
4b7b9dd4ab Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01
am: 05f5afd834

Change-Id: I0c53f19be9898d206c8b5c3ba4784595d509925d
2017-07-17 21:22:51 +00:00
Chenbo Feng
a75b9016f1 Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77
am: e2753dbabb

Change-Id: Iba9cee9b7ffc67fa836e58eb547dd00b3b491321
2017-07-17 21:18:55 +00:00
Chenbo Feng
05f5afd834 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e
am: 280d269f01

Change-Id: Ic1e80a7b0345cb20180cbe6faed9ca803cabcb60
2017-07-17 21:16:26 +00:00
Chenbo Feng
e2753dbabb Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev
am: 26339f2d77

Change-Id: I7ba2bb548300d511ce0b7205e1055554406582f8
2017-07-17 21:11:59 +00:00
Chenbo Feng
280d269f01 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev
am: e37efbd57e

Change-Id: I40463d0c63199f3e93288a95c5ca6cc5eb52f500
2017-07-17 21:09:29 +00:00
Android Merger
26339f2d77 Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev 2017-07-17 21:02:57 +00:00
Chenbo Feng
3cd4cc6251 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev
am: e37efbd57e

Change-Id: Ic7c13aa9c7abee40a812f6d7879a2d474f096d03
2017-07-17 21:02:46 +00:00
Chenbo Feng
997814263d Resolve merge conflicts of 8482d8c85c to nougat-cts-dev
Test: I solemnly swear I tested this conflict resolution.
      in cts-tf: run cts --module CtsNativeNetTestCases

Change-Id: I15253841993a79320dafa8669f0289c28f4ff4ea
2017-07-17 20:44:39 +00:00
Tina Zhou
576bfa9242 Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev am: 8482d8c85c am: 766fa6a623
am: 14a394402f

Change-Id: I5586b1f18e12f0022040de044ad1291b642dbf9e
2017-07-13 21:17:09 +00:00
Tina Zhou
766fa6a623 Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev
am: 8482d8c85c

Change-Id: I2fefc3090844c2ed9be8434ad0d0bcd11af13d08
2017-07-13 21:02:32 +00:00
Lorenzo Colitti
08bdb15d74 Dup fds to stop finalizers from invalidating them.
The hostside VPN tests were failing because finalizers were
closing the ParcelFileDescriptors that we use to get socekt fds.
The close operations were causing the fds to be marked as invalid
(i.e., -1), causing the tests' system calls on them to fail with
EBADF.

Fix this by dup(2)ing the fds and closing the original objects.

Also, add some asserts to debug this sort of failure.

Fix: 35927643
Test: HostsideVpnTests passed 20/20 times on bullhead
Change-Id: If88530b5bd32622bd4726cd6f0907f731209bb43
(cherry picked from commit a7ec8300d9)
2017-07-07 06:30:00 +00:00
Chenbo Feng
ba65ffc462 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 --package android.net.native
2017-06-28 13:47:30 -07:00
TreeHugger Robot
73a81b18cd Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev 2017-06-21 00:31:47 +00:00
Rebecca Silberstein
a2283cd312 Merge "WifiManagerTest: check softap mode supported" into oc-dev 2017-06-20 17:18:25 +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
Rebecca Silberstein
db77edac1c WifiManagerTest: check softap mode supported
When running the LocalOnlyHotspot tests, first check if
isPortableHotspotSupported is true.

Bug: 62343300
Test: cts-tradefed run cts-dev --module CtsNetTestCases -t
android.net.wifi.cts.WifiManagerTest

Change-Id: Ie36435c3eb5b41ada4b64a3e7452b006da41b00c
2017-06-16 17:21:59 -07: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
Sudheer Shanka
1f29891f4b Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev 2017-06-12 19:13:53 +00: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
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
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
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
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
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
Huihong Luo
e4bbd10431 cts: skip wifi related tests if wifi is unsupported
Such as in the case of Android emulator.

BUG: 37633976

Test: ANDROID_BUILD_TOP= ./android-cts/tools/cts-tradefed run cts -m
CtsNetTestCases

Change-Id: Id4ee7b216ea12ad9599953b439c91db96d38b374
2017-05-19 14:31:29 -07:00
TreeHugger Robot
b061da6df9 Merge "cts(wifi): Fix WifiManager.testWifiManagerActions" into oc-dev 2017-05-18 19:13:12 +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
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
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
569fdfd845 Merge "Fix CtsHostsideNetworkTests." into oc-dev 2017-05-02 05:12:53 +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
6a25ed09f9 Merge "Update CTS tests to reflect ConnectivityManager API changes." into oc-dev 2017-04-28 03:58:10 +00:00