Commit Graph

1440 Commits

Author SHA1 Message Date
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
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
4ae5e1d2a1 Merge "Revert "Relax the check of network availability in CtsHostsideNetworkTests."" into oc-dev
am: 6ec7be5f3c

Change-Id: I1fbbb4f651cc227a59d3d19f871ed3b6679e03b0
2017-04-21 02:06:21 +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
30775693ec Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev am: d017754253
am: 92a7123377

Change-Id: I2d9107c6e50ba94f9bfe39bfbcb79c1a5390f0a6
2017-04-19 01:06:55 +00:00
Nathan Harold
92a7123377 Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev
am: d017754253

Change-Id: I1c295d68bcc554a685221f6e761cab87a4fec632
2017-04-19 00:57:01 +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
nharold
bd6d169a27 Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16
am: 335800627b

Change-Id: I276c35e350be82b01f68c260a39e7b33bab619c1
2017-04-18 22:00:45 +00:00
nharold
40fe746f16 Merge "Remove DatagramSocket calls from IpSecManagerTest" 2017-04-18 18:35:21 +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
21ec60f4db Merge "Skip data saver related tests if the device doesn't support it." into oc-dev
am: a61bc6a566

Change-Id: Idbee1ba7843242a5cac46e8a62c642c2f8b37fd3
2017-04-18 04:29:27 +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
35fab09f68 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: af849f9dc0 am: ba9c18e7af am: 9d66f94f38 am: ecb7895518
am: e6254e6d0f

Change-Id: I759aca3c07967c72bc601217ca7f96b23889ae9c
2017-04-17 18:16:45 +00:00
Tina Zhou
e6254e6d0f 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: af849f9dc0 am: ba9c18e7af am: 9d66f94f38
am: ecb7895518

Change-Id: Ia58d668d02a973cceb5fa6fa3929a58b928427b3
2017-04-17 18:07:17 +00:00
Tina Zhou
d08aec4d0f 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: af849f9dc0 am: ba9c18e7af am: 9d66f94f38 am: 02bf062557
am: 36d6165138

Change-Id: I7f9eba827ff9fc5d7f6790b8553a3fcf938744ea
2017-04-17 18:07:17 +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
Tina Zhou
36d6165138 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: af849f9dc0 am: ba9c18e7af am: 9d66f94f38
am: 02bf062557

Change-Id: I190660c19b73f655a15c6751376b177e2afbc586
2017-04-17 18:02:48 +00:00
Tina Zhou
ecb7895518 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: af849f9dc0 am: ba9c18e7af
am: 9d66f94f38

Change-Id: I5e4b1272325ab0f16eb4cfc981b10a05c776a2da
2017-04-17 17:58:56 +00:00
Tina Zhou
02bf062557 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: af849f9dc0 am: ba9c18e7af
am: 9d66f94f38

Change-Id: I4120d23485f910260b31794894373df52018adaa
2017-04-17 17:58:45 +00:00
Tina Zhou
293d94f734 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

Change-Id: I60b3c8fd3d3167d4f878a273b4122514693d4941
2017-04-17 17:58:21 +00:00
Tina Zhou
aeb1d2f1cf 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

Change-Id: Id80e3f9e8fbb5eceb9a2b3da341f49803795b3e6
2017-04-17 17:53:26 +00:00
Tina Zhou
ba9c18e7af 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: af849f9dc0

Change-Id: Idbe7d08b01d9138c5c2082f08a392090dd82c466
2017-04-17 17:48:16 +00:00
Tina Zhou
af849f9dc0 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

Change-Id: Ie16ec6e4e3d139da6bb66d18bba18c97b1ed7a4c
2017-04-17 17:43:44 +00:00
Android Merger
0a33006809 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" 2017-04-17 17:39:14 +00:00
Tina Zhou
e5e55017fc 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

Change-Id: Id8398453ea4b85d04da963ab48876407b0237e41
2017-04-17 17:39:06 +00:00
Tina Zhou
6ee31c8e8f 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 2017-04-17 17:37:29 +00:00
Sudheer Shanka
a79cd59e8f Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b am: 5b87fbabc3 -s ours am: 65f950fd9f
am: cfae83193b

Change-Id: Ibc81af06e220219c9f896f56ed8af1d43b6cffe7
2017-04-15 01:24:40 +00:00
Sudheer Shanka
cfae83193b Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b am: 5b87fbabc3 -s ours
am: 65f950fd9f

Change-Id: I4b6292e5146beb76946c6e331f93e6959e895872
2017-04-15 01:06:58 +00:00
Sudheer Shanka
65f950fd9f Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b
am: 5b87fbabc3  -s ours

Change-Id: Ib84441f7d5d47dd4b8f5a61ae1f679e93aab7438
2017-04-15 01:04:12 +00:00
Sudheer Shanka
617d73fca5 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b am: 5b87fbabc3 am: 8d873914a2 -s ours
am: b420e267e1

Change-Id: I7fcf0b289ddfdf9e37c5a9b1dade6742ea3a3a50
2017-04-14 23:10:29 +00:00
Sudheer Shanka
562020d9b5 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours" am: 67a8712d22 -s ours am: e9122b9946 -s ours am: 368d667a4b -s ours
am: a203e22df8

Change-Id: I5b343f072ef5fcf1caa8256451b505987140bcf4
2017-04-14 23:08:51 +00:00
Sudheer Shanka
b420e267e1 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b am: 5b87fbabc3
am: 8d873914a2  -s ours

Change-Id: Ic8ad0c278439e66c8bb70efa15a1618ff81f743a
2017-04-14 23:01:50 +00:00
Sudheer Shanka
a203e22df8 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours" am: 67a8712d22 -s ours am: e9122b9946 -s ours
am: 368d667a4b  -s ours

Change-Id: I71cc8a02fe24e2d6c0563b17b8b853381b39880c
2017-04-14 23:00:23 +00:00
Nathan Harold
a6098bf5f7 Merge "Update IpSecAlgorithm CTS for API compliance changes" into oc-dev am: 9b807d83a4
am: 17ffc4867c

Change-Id: I7537c1d35919147604aa36611775485653c8ec07
2017-04-14 20:34:33 +00:00
Nathan Harold
17ffc4867c Merge "Update IpSecAlgorithm CTS for API compliance changes" into oc-dev
am: 9b807d83a4

Change-Id: Id0d8cc946c6a6a73bc661263dc1233a81ef4df0a
2017-04-14 20:29:21 +00:00
Nathan Harold
9b807d83a4 Merge "Update IpSecAlgorithm CTS for API compliance changes" into oc-dev 2017-04-14 20:21:19 +00:00
Sudheer Shanka
49bf2edd92 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 am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5 am: 4952b4fce2 -s ours am: dc3f163de2
am: d99f8e8b16

Change-Id: I37d5cc0fe657f9cf6e2a837732714ecd76f79f11
2017-04-14 18:59:55 +00:00
Sudheer Shanka
d99f8e8b16 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 am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5 am: 4952b4fce2 -s ours
am: dc3f163de2

Change-Id: I2f77c6b4cef68ef6f2c4e53bd76f1449fadd5154
2017-04-14 18:41:26 +00:00
Sudheer Shanka
dc3f163de2 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 am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5
am: 4952b4fce2  -s ours

Change-Id: Icdcf777e3873eda4fa552ab6f1791d1ff42ee74d
2017-04-14 18:39:00 +00:00
Sudheer Shanka
fd98cbb581 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 am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5 am: 4952b4fce2 am: 2d01f2a0de -s ours
am: e33887ac9b

Change-Id: I50ce91739bb506e4ffedec8625dd55dac7a8506e
2017-04-14 18:13:07 +00:00
Sudheer Shanka
e33887ac9b 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 am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5 am: 4952b4fce2
am: 2d01f2a0de  -s ours

Change-Id: I7558b6f5edb9f702b1d808f535569aa45a537af9
2017-04-14 16:59:39 +00:00
Sudheer Shanka
d4f91db879 Merge "Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours am: bb6a9be084 am: 89195184af am: 0a0b1d2fe6 -s ours am: 8903a0aa04" into oc-dev-plus-aosp
am: f04219bb3a

Change-Id: Iaf1019e0b9dbfa29d8d773eea53074b74e8a014a
2017-04-14 16:38:54 +00:00
Sudheer Shanka
6c9d1baba5 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours am: bb6a9be084 am: 89195184af am: 0a0b1d2fe6 am: 5e93a23108 -s ours
am: 9830006d01

Change-Id: Ie5144f97f2a8f73f8eaadc1dc2f5f95f833f4cec
2017-04-14 16:38:15 +00:00
Sudheer Shanka
57a22b14e8 Merge "Merge "Merge "Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours" am: 608a3b8f82 -s ours am: 8884bfc2ac -s ours" into nyc-mr2-dev-plus-aosp am: c95fb00d30 -s ours" into oc-dev-plus-aosp
am: ccff2be967

Change-Id: I13a46756d87c7adde9672605c299a49c327f1956
2017-04-14 16:31:57 +00:00
Jocelyn Dang
7e6a4f4309 Merge "Change test to use set-mode cmd." into oc-dev am: f9a022629f
am: 9665fa7f99

Change-Id: I86aa03eacde93b245cd24635ed5fe5258e8739d3
2017-04-14 13:21:11 +00:00
Sudheer Shanka
8d873914a2 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b
am: 5b87fbabc3

Change-Id: I283e9c5b9b59f4e59da918dd5d0c4bd57ccc265a
2017-04-14 00:57:07 +00:00