Chenbo Feng
85de5d94bc
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386
...
am: 3f96549bd1
2017-09-14 21:58:00 +00:00
Chenbo Feng
880ad913b8
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
...
am: f68fa658b6
2017-09-14 21:55:29 +00:00
Chenbo Feng
72ea1b2420
Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev
...
am: f33518ff9d
Change-Id: I705950d7d620ac21cc74c2584c0e3256f17af15e
2017-09-14 03:55:19 +00:00
Android Merger
6a0cb56e57
Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours"
2017-09-07 18:10:38 +00:00
Sudheer Shanka
516c8c9872
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
...
am: b5abc8f89b
2017-09-07 18:10:25 +00:00
Android Merger
b5abc8f89b
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
2017-09-07 18:08:35 +00:00
Sudheer Shanka
9418ecdc40
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev
...
am: 203361a0c3
Change-Id: Ifbd3594524de6fc45cb199345715794f9869c9d6
2017-09-07 18:08:27 +00:00
Sudheer Shanka
07e00f7523
Increase timeout for ordered broadcast response.
...
Bug: 65269531
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Merged-In: Ibdb84048b04405f234aa5ad9124eb70e9e592498
Merged-In: I99668396abcf7421cd7ffb9118e309aaecb80f07
Change-Id: I6f1de7ccc8d4164dc6f770b54863c04bb7d9e62e
2017-09-05 14:56:04 -07:00
Lorenzo Colitti
ad86c0342e
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9"
...
am: 1e524c5db2
2017-08-09 16:36:01 +00:00
Android Merger
1e524c5db2
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9"
2017-08-09 16:24:14 +00:00
Lorenzo Colitti
9196e62bb2
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev
...
am: bfabfe75f9
2017-08-09 16:24:03 +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
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
2017-07-18 18:35:41 +00:00
Chenbo Feng
120ebca195
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1
...
am: 0545b99cab
2017-07-18 18:25:17 +00:00
Chenbo Feng
0545b99cab
Resolve merge conflicts of 2ce31b513f to nyc-dev
...
am: 3d166665b1
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
2017-07-17 21:26:53 +00:00
Chenbo Feng
ff54e7910c
Merge "Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77 -s ours"
...
am: 175a223183
2017-07-17 21:23:04 +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
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
2017-07-17 21:18:55 +00:00
Android Merger
175a223183
Merge "Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77 -s ours"
2017-07-17 21:17:07 +00:00
Chenbo Feng
fac19af0dd
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev
...
am: 26339f2d77
2017-07-17 21:16:51 +00:00
Chenbo Feng
05f5afd834
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e
...
am: 280d269f01
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
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
Huihong Luo
7e31eb7564
Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev
...
am: 73a81b18cd
2017-06-21 00:41:01 +00: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
88d9f08c93
Merge "WifiManagerTest: check softap mode supported" into oc-dev
...
am: a2283cd312
2017-06-20 17:24:57 +00:00
Rebecca Silberstein
a2283cd312
Merge "WifiManagerTest: check softap mode supported" into oc-dev
2017-06-20 17:18:25 +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
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
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
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
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
Sudheer Shanka
d6c990a6da
Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev
...
am: 1f29891f4b
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
