Commit Graph

873 Commits

Author SHA1 Message Date
Adam Vartanian
43aea5638c DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
am: 8cb75edc3a

Change-Id: I1a2e5c168e011aa9e4b5cda1cc264293ec32e834
2018-01-10 19:34:50 +00:00
Adam Vartanian
8cb75edc3a DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours
am: dfbb7a24e1  -s ours

Change-Id: Id23f5b58c058be206490b403981c850edff8f338
2018-01-10 19:24:07 +00:00
Adam Vartanian
d58943f9bd Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d
am: c6743de860

Change-Id: I4a7465bfae8fec503987e7587d81e74982fd57b8
2018-01-10 19:18:46 +00:00
Adam Vartanian
2c7b1033b8 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
am: efb0258e08

Change-Id: Ied68f3ae10135b491ae4583eacd8f8bceaa76c5e
2018-01-10 19:18:02 +00:00
Adam Vartanian
dfbb7a24e1 DO NOT MERGE Add CTS test for URI fix.
am: 1efb5151db  -s ours

Change-Id: I7cb28b5ac56f616a23a99d466606da8221eaa58e
2018-01-10 19:12:49 +00:00
Adam Vartanian
c6743de860 Merge changes from topic "n" into nougat-cts-dev
am: a220d6d27d

Change-Id: I1228020231b3d1e0d9e26891b813060bcc862c4c
2018-01-10 19:12:04 +00:00
Adam Vartanian
efb0258e08 DO NOT MERGE Add CTS test for URI fix.
am: 53a9c9bc34  -s ours

Change-Id: Idb0448c477445735b31a0dcd9d30df069470ff85
2018-01-10 19:11:55 +00:00
Treehugger Robot
a220d6d27d Merge changes from topic "n" into nougat-cts-dev
* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 18:59:52 +00:00
Adam Vartanian
53a9c9bc34 DO NOT MERGE Add CTS test for URI fix.
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c)
2018-01-08 12:57:18 -08:00
Adam Vartanian
1efb5151db DO NOT MERGE Add CTS test for URI fix.
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c)
2018-01-08 12:52:51 -08:00
Adam Vartanian
2204809646 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832
am: 1e1de4f052

Change-Id: I4153cfa021655ba19b4b6dca19b70aaf91b5caa8
2017-11-07 22:08:32 +00:00
Adam Vartanian
1e1de4f052 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42
am: e88ef1b832

Change-Id: Ie60c0885bc52b26fa900d2908946a56169d2f04c
2017-11-07 21:52:12 +00:00
Adam Vartanian
5d8ba63f42 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa
am: c210cc1a90

Change-Id: I276a0be85c41f823506fc8397050d406257324e9
2017-11-07 21:26:57 +00:00
Adam Vartanian
73105d42aa Add CTS test for URI fix. am: a01da8536c
am: b1b5379591

Change-Id: Ib1bcf1c84ee878161f812e8a9ba762a746329a3b
2017-11-07 20:49:55 +00:00
Adam Vartanian
b1b5379591 Add CTS test for URI fix.
am: a01da8536c

Change-Id: I21c707648e6cc02b267f663bd02140dd66b6bd80
2017-11-07 20:40:20 +00:00
Adam Vartanian
a01da8536c Add CTS test for URI fix.
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
2017-11-07 14:02:08 +00:00
Sudheer Shanka
46f8aa6d48 Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3
am: 662e13b57a

Change-Id: I0d070bfbe19666f77b9ae21c19893f776389fac0
2017-09-07 18:20:35 +00:00
Sudheer Shanka
662e13b57a Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev
am: 203361a0c3

Change-Id: I7bd246e79792960c53e12c166a255eabe7f428ed
2017-09-07 18:11:26 +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
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
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
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
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
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
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
Sudheer Shanka
8be8d0d6a9 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours
am: 8b0491eb1f

Change-Id: I6df9cff2bdb441d7c7b45dbcef252b195212a929
2017-04-13 23:32:16 +00:00
Sudheer Shanka
8b0491eb1f Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev
am: 43a0aa48b0  -s ours

Change-Id: I7c31558b0102a8464d15121c21402f0de77c8b12
2017-04-13 23:26:10 +00:00
Sudheer Shanka
d69455289f DO NOT MERGE: Skip data saver related tests if the device doesn't support it.
Bug: 36007771
Test: manual
Change-Id: I817d2cc23e5c8d460367ede749ff35e799f48ee0
2017-03-31 15:54:35 -07:00
Tina Zhou
b0dcfcc14c Merge "Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev am: dfc0ec200f" into nyc-dev
am: 2be6d78c13

Change-Id: I578972101d3b4c46132fc360be18a5dd947a4113
2017-02-15 00:57:59 +00:00
Tina Zhou
6ec77dd104 Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev
am: dfc0ec200f

Change-Id: I7ff23d2936d7e9e21eaf8909b2e07c5c816cc32c
2017-02-15 00:54:56 +00:00
Tina Zhou
dfc0ec200f Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev 2017-02-15 00:48:44 +00:00
bohu
6dd1ce66c9 CTS: skip wifi related net test if no such feature am: 2fa6e7ce43
am: 4b6d85e98c

Change-Id: Iecc534b475bc1c0c4211aba8b87122476b89e263
2017-02-03 17:31:11 +00:00
bohu
4b6d85e98c CTS: skip wifi related net test if no such feature
am: 2fa6e7ce43

Change-Id: I9a672139ea9e1b8675912a06315c6a4902411be8
2017-02-03 17:29:11 +00:00
bohu
2fa6e7ce43 CTS: skip wifi related net test if no such feature
When a device does not have wifi feature,
we should skip wifi related net tests.

BUG: 31806034
Change-Id: I9867342c47499efc855a50a67a04177fa94e83e5
2017-01-19 14:07:58 -08:00
Bjoern Johansson
68ec71d954 Don't require WiFi in CtsHostsideNetworkTests
WiFi is not a CDD requirement so these tests should not fail when the
device under test does not have WiFi. The behavior is changed so that if
there is WiFi then both metered and unmetered tests will run. If there
is no WiFi and the current connection is metered then only metered tests
will run. If there is no WiFi and the current connection is not metered
then only unmetered tests will run.

Test: Successfully ran CTS test on both emulator and shamu.

BUG: 31648368
Change-Id: Ic643d2490e0a7e69b57a44599f1a4c57c67da873
2016-12-12 19:34:04 +00:00
Nicolas Boichat
5ee79a1d24 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9
am: d8bd696559

Change-Id: I0d634d5a57b4a93963e4f93e5572b9bef715af58
2016-10-19 18:04:32 +00:00
Nicolas Boichat
d8bd696559 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292
am: 3342023de9

Change-Id: I6c3da43716d4072e6f0beb3e3a2b5b0bffa0aba3
2016-10-18 00:17:23 +00:00
Nicolas Boichat
c4df82d292 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426
am: ffe4cefe73

Change-Id: Ib17900cfd7e3371c6afb703c956dd9d4aa7e26f1
2016-10-17 22:04:33 +00:00
Nicolas Boichat
5696846426 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
am: 36c0f02d94

Change-Id: Ic7b755d02b3d1b85fbbff7d22554128079fc5a37
2016-10-17 21:50:57 +00:00
Nicolas Boichat
171491fa35 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9
am: fac99e31ce

Change-Id: Ib46e30a62620b942afc54d92b1da62412308095a
2016-10-17 17:10:49 +00:00
Nicolas Boichat
fac99e31ce PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94
am: 516b0616e9

Change-Id: Ib0bdd7ba610c8206356233620c8941695eeaf9a6
2016-10-17 05:23:18 +00:00
Nicolas Boichat
516b0616e9 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
am: 36c0f02d94

Change-Id: Icc98803ea5d4f52cefb43b40d2dcfbd76de1b464
2016-10-17 05:15:47 +00:00
Tina Zhou
908de2e143 Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5
am: 4c76844837

Change-Id: Id59f50335fc16f56101f6d35dfc976bf2bcd285a
2016-10-13 15:57:12 +00:00
peter_li
254dfe5017 [CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d
am: ca83ca8472

Change-Id: Id254c85d140dd854e095e47c1465b73426053fc5
2016-10-13 15:56:52 +00:00
Tina Zhou
4c76844837 Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev
am: e7c890f1e5

Change-Id: I5580f0fdbfae37f0949af40988e0a5585e8e4a7f
2016-10-13 15:49:18 +00:00
peter_li
ca83ca8472 [CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case.
am: 2ecad8d87d

Change-Id: If9c72d61d403b37ecd398179d5d3b447d252d7dc
2016-10-13 15:49:16 +00:00
Tina Zhou
e7c890f1e5 Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for “CtsHostsideNetworkTests” test case." into nougat-cts-dev 2016-10-13 15:39:50 +00:00
peter_li
2ecad8d87d [CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for “CtsHostsideNetworkTests” test case.
Symptom: It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for “CtsHostsideNetworkTests” test case.
Root Cause: The test function “setBatterySaverMode” of “CtsHostsideNetworkTests” use command to set setting DB when trying to turn on battery saver. But while trying to turn off battery saver, it only use charger plug-in event. It should be more reasonable to turn off battery saver through similar DB setting as this function did at turning on.
Solution: To control battery saver function from setting DB.
Project:
Note:
Test done by RD:
Futher testing need Q team's support:

Bug: 31897608

Change-Id: Id70ba458e85f98393d7652bb4e79bd182172c60f
2016-10-13 07:36:53 +00:00