Commit Graph

1881 Commits

Author SHA1 Message Date
Chalard Jean
8d66f2dc82 Merge "Add CTS tests for getMultipathPreference" 2018-04-03 09:16:09 +00:00
Chalard Jean
8a0530bb9c Add CTS tests for getMultipathPreference
Test: Test passing with 1 or more connected wifis
      No wifi won't pass but it's already a requirement
Bug: 34630278

Change-Id: I43bf18943fbd00dc29417b18604e29f9111ec0b2
Merged-in: I43bf18943fbd00dc29417b18604e29f9111ec0b2
Merged-in: Ie90ca72ea3606dea4259984d42762dd742d59970
2018-04-03 05:27:38 +00:00
Benedict Wong
a48cb94938 Merge "Prevent CTS from hanging if no UDP packet was received" 2018-03-30 18:17:56 +00:00
Benedict Wong
ef1a43e2c1 Prevent CTS from hanging if no UDP packet was received
Previously, CTS tests could block forever on attempting to read a packet
from a UDP socket.

This patch modifies the receive methods of the NativeUdpSocket wrapper,
allowing it to gracefully fail if UDP packets are not received.
This patch also updates the IKE over UDP encap socket test to use the
NativeUdpSocket wrapper, preventing the tests from hanging in the same
fashion.

Bug: 70938121
Test: Ran updated tests on walleye + marlin
Change-Id: I390e4585e85647eb8555e706d44b76f95dec931f
2018-03-30 18:17:21 +00:00
Benedict Wong
77627ce58b Merge changes from topic "generic-socket"
* changes:
  Switch checkTcp and checkUnconnectedUdp to use generic sockets
  Add generic socket interfaces and functions
2018-03-30 18:17:01 +00:00
Benedict Wong
376335421e Switch checkTcp and checkUnconnectedUdp to use generic sockets
This patch switches IpSecManager checkTransform() tests to use generic
sockets, allowing for exercising of Java sockets as well as native/OS
sockets.

Bug: 76152303
Test: This; ran on Walleye
Change-Id: I515227e7aa04c424aefbbe46209ddce81421b2f1
2018-03-30 18:15:36 +00:00
Benedict Wong
3f6d149f3d Add generic socket interfaces and functions
This patch adds functionality to unify java and native sockets. This is
part one of two of a change to allow functionality for testing full
coverage of all APIs.

Bug: 76152303
Test: Ran tests on Walleye
Change-Id: I9bd57d6267f82d8c1ac293a0147dc2c115dd4181
2018-03-30 18:14:46 +00:00
Benedict Wong
2a4463d257 Merge "Add GCM to algorithms tested in CTS" 2018-03-30 18:14:14 +00:00
Lorenzo Colitti
8f507d4edd Merge "Update encapSocket API calls to getFileDescriptor" 2018-03-30 04:58:47 +00:00
Benedict Wong
675406b789 Update encapSocket API calls to getFileDescriptor
This change updates the getSocket calls to getFileDescriptor, persuant
to new API.

Bug: 72473753
Test: CTS tests run on walleye
Change-Id: I65479cb35c88aee1f65c8597c3382cd30fa8d4a9
2018-03-27 17:00:41 -07:00
Benedict Wong
f3e34ff699 Add GCM to algorithms tested in CTS
This change adds all combinations of GCM algorithms, ensuring proper
support, config flags, and data accounting. Algorithm for calculating
size of packets has also been made more generic to allow for calculation
based on different encryption algorithms.

Bug: 73261868
Test: This
Change-Id: Ib77ac237fee75415223f0291cecc0b60ce76b77f
2018-03-27 16:37:41 -07:00
Benedict Wong
d4477edaf3 Merge "Add tests where only auth or crypt are enabled" 2018-03-23 17:25:10 +00:00
Benedict Wong
f8ccb00aa6 Add tests where only auth or crypt are enabled
This patch adds tests for cases where only auth or crypt are enabled.
These cases are supported, and this patch adds test coverage.

Bug: 75049573
Test: this, run on walleye
Change-Id: I656d9c4a86c13ce4928d6bd68a9e0d48cf805191
2018-03-22 20:58:21 +00:00
Benedict Wong
0ce11669ab Merge "Add tests for IPsec SPI expiration timer changes" 2018-03-16 17:45:20 +00:00
Benedict Wong
b84436977a Add tests for IPsec SPI expiration timer changes
This change adds tests to ensure that SPI expiration timers are set to a
high value, greater than 1 hour (3600s).

Bug: 72316671
Test: Ran this, and MultiNetworkSysCtlTest.
Change-Id: Ib4776322bd5df772a3700b6e7ed1b5e7ed6b4637
2018-03-15 23:42:39 -07:00
Anton Hansson
fed17889c7 Merge "cts: Set LOCAL_SDK_VERSION where possible." 2018-02-26 13:57:25 +00:00
Anton Hansson
505cbf0342 cts: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: I687153389dd4bfab1c83df5d9af83d89bed76fd4
Merged-In: I5afdfc8e1e523768db9065dd3571cb31bc1dfac5
2018-02-26 12:09:09 +00:00
Hugo Benichi
83e4cf5085 Add CTS coverage for MacAddress
Bug: 71866627
Test: cts-tradefed run cts-dev --module CtsNetTestCases -t android.net.cts.MacAddressTest
Change-Id: I2d8702b154a485f89911e1affb7cee79692f3ac7
2018-01-30 14:40:51 +09:00
nharold
1ca0e05919 Merge "IpSec - API Tweak for removeTransportModeTransforms" 2018-01-17 19:07:10 +00:00
Nathan Harold
9c590594b6 IpSec - API Tweak for removeTransportModeTransforms
Update IpSec tests to remove the transform parameter from
calls to removeTransportModeTransform(). It is infeasible
and thus removed.

Bug: 72079356
Test: cts - IpSecManagerTest
Change-Id: Iaa0b35b24bf044503da9af9966508ac5e88846e1
2018-01-17 01:07:52 -08:00
nharold
44eef0ee8d Merge "Update testCreateTransform() for one-way transforms" 2018-01-17 08:45:29 +00:00
nharold
5810dda443 Merge "Update IpSecManagerTest for API changes to Transforms" 2018-01-17 08:40:37 +00:00
Nathan Harold
f91b5a214b Update testCreateTransform() for one-way transforms
This patch augments testCreateTransform() to
selectively apply the ipSecTransform in one/both
directions and then verifies that the link succeeds or
fails correctly. In addition, this converts the test
to use the Java sockets API for DatagramSocket instead
of using the FD-based API. One of the combos does not
fail as expected, so b/72048263 is tracking further
work needed.

Bug: 72047396
Bug: 71717213
Test: cts - IpSecManagerTest

Change-Id: Ied961f442b29f1e66ded37c7ffe7afdd4a5c49da
2018-01-16 21:12:43 -08:00
Android Merger
e2201303a6 Merge changes from topic "am-a1e8782806b548b280daa90a2ff2320c"
* changes:
  Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev am: 9f63146b7d
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours am: ca0bfec15d  -s ours am: 482d1b4a62  -s ours
2018-01-16 22:03:00 +00:00
Android Merger
d6a893adf4 Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev
am: 9f63146b7d

Change-Id: I9883f8b542bab40c8db4de1c8a768fd12b04a3c2
2018-01-16 22:02:49 +00:00
Adam Vartanian
c0d866facc DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours am: ca0bfec15d -s ours
am: 482d1b4a62  -s ours

Change-Id: Ia18553aebf6e6306ce3e3e590ad6f2972c73a1bb
2018-01-16 21:56:40 +00:00
Android Merger
9f63146b7d Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c72207
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours am: ca0bfec15d  -s ours
2018-01-16 21:48:43 +00:00
Android Merger
58d0305cf1 Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev
am: de16c72207

Change-Id: I78658a04d27b680f8863dbdc3eecf57b45087aa1
2018-01-16 21:48:33 +00:00
Adam Vartanian
482d1b4a62 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours
am: ca0bfec15d  -s ours

Change-Id: I13dbb0c257db4c763d6ccc131e0486a13e5ed21d
2018-01-16 21:44:11 +00:00
Android Merger
de16c72207 Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev
* changes:
  Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours
2018-01-16 21:38:59 +00:00
Android Merger
280672fd93 Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
am: 5962c9a234

Change-Id: If3153994b6609d626af3ed58c47f33aad5cf19ec
2018-01-16 21:38:46 +00:00
Adam Vartanian
ca0bfec15d DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours
am: 9dc912e515  -s ours

Change-Id: I29a2fc035147a9ab695dd8ca3e8c1dbabbb83246
2018-01-16 21:36:07 +00:00
Android Merger
5962c9a234 Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
* changes:
  Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours
2018-01-16 21:32:32 +00:00
Android Merger
dca340db07 Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
am: f582e9dede

Change-Id: Iffcf7f437e5e438796f01dd86e9599047292cd2f
2018-01-16 21:32:21 +00:00
Adam Vartanian
9dc912e515 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours
am: 84a9da7ac9  -s ours

Change-Id: Ie5f8bf09bdb80355c9eac6d5361f089411216ad5
2018-01-16 21:30:40 +00:00
Android Merger
f582e9dede Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
* changes:
  Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours
2018-01-16 21:28:42 +00:00
Android Merger
2d8bad1b3b Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
am: 27e23e96ca

Change-Id: Ic1e94cf87bd0cf722ba1212ae0251d3c06f93f73
2018-01-16 21:28:30 +00:00
Adam Vartanian
84a9da7ac9 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
am: 181a10e364  -s ours

Change-Id: Iea8aaec612ff4837000fece3813764b424f9227b
2018-01-16 21:27:42 +00:00
Nathan Harold
19adaa182d Update IpSecManagerTest for API changes to Transforms
API changes in IpSecManager and IpSecTransform are
reflected in these test updates: no functional change
to the test; just style updates along with improvement
in the clarity of using a single transform for both
directions.

Bug: 71717213
Test: CTS - IpSecManagerTest
Change-Id: Ia6933d010620516672687080898f8c4fd83223bc
2018-01-16 11:15:13 -08:00
Android Merger
93dcd95b8b Merge "Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071" into oreo-mr1-cts-dev am: 803a8520c2" 2018-01-12 00:12:15 +00:00
Android Merger
eeef276826 Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071" into oreo-mr1-cts-dev
am: 803a8520c2

Change-Id: I2feea16764dc7844a083e16df3e401b5158c11df
2018-01-12 00:12:10 +00:00
Android Merger
803a8520c2 Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071" into oreo-mr1-cts-dev 2018-01-12 00:07:48 +00:00
Alex Vakulenko
daf2e786d2 Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev
am: 9992c29071

Change-Id: I5ea0bd658d11252b1c32cab7bedd1bfac8e80b26
2018-01-12 00:07:41 +00:00
Treehugger Robot
9992c29071 Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev 2018-01-12 00:01:30 +00:00
Android Merger
27e23e96ca Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
* changes:
  Merge changes from topic "l1" into lollipop-mr1-cts-dev am: ba3927948d
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours
2018-01-11 23:56:54 +00:00
Adam Vartanian
b0ba87dd9b Merge changes from topic "l1" into lollipop-mr1-cts-dev
am: ba3927948d

Change-Id: I71f9c4d293a0913b3274b070a6ed50c4731ab1b1
2018-01-11 23:56:45 +00:00
Adam Vartanian
181a10e364 DO NOT MERGE Add CTS test for URI fix.
am: 36c5e0d87f  -s ours

Change-Id: I3f40aa91536bde04f153c3f0d6c218b556d40238
2018-01-11 23:56:40 +00:00
Treehugger Robot
ba3927948d Merge changes from topic "l1" into lollipop-mr1-cts-dev
* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-11 23:52:44 +00:00
Adam Vartanian
36c5e0d87f 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-11 15:18:47 -08:00
Android Merger
7898d269e2 Merge changes from topic "am-dd7b05d27e59420687cc02c82e51669b"
* changes:
  Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev am: d1f18aeba3
  DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours am: 50ec90be8d  -s ours
2018-01-11 23:00:21 +00:00