Commit Graph

1188 Commits

Author SHA1 Message Date
Lorenzo Colitti
6607f6d59b Merge "Dup fds to stop finalizers from invalidating them." am: d7a02820ac
am: 3232d55bdf

Change-Id: I98e89a7d0e7f25dab92e278a319d502713489979
2017-03-16 03:38:05 +00:00
Lorenzo Colitti
3232d55bdf Merge "Dup fds to stop finalizers from invalidating them."
am: d7a02820ac

Change-Id: Ia0aedcf2cd8d56f8a8c31b3af95ae8a2ae0dedd0
2017-03-16 03:33:04 +00:00
Lorenzo Colitti
d7a02820ac Merge "Dup fds to stop finalizers from invalidating them." 2017-03-16 03:27:14 +00:00
Lorenzo Colitti
a7ec8300d9 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
2017-03-16 08:25:55 +09:00
Peter Qiu
13f9cdc313 Merge "wifi: update callsite for Passpoint configuration management APIs" am: c77019853f
am: 4f8b0abd52

Change-Id: I6e9a74fdd711a8c2bafe6730cb52e2a153155ede
2017-03-14 16:31:37 +00:00
Peter Qiu
4f8b0abd52 Merge "wifi: update callsite for Passpoint configuration management APIs"
am: c77019853f

Change-Id: If3aadefde81b4998f2c86a5bc3e074aa3a8582b2
2017-03-14 16:17:27 +00:00
Peter Qiu
154dea6b60 wifi: update callsite for Passpoint configuration management APIs
The APIs are updated to not return a boolean status based on
the API Councils comment.  So update the callsite accordingly.

Bug: 35858311
Test: make -j32
Change-Id: Ie9106ecddb2b15178ad37ec6f014d5cc7ce77c43
Merged-In: Ie9106ecddb2b15178ad37ec6f014d5cc7ce77c43
2017-03-13 10:35:44 -07:00
Etan Cohen
31893a78ba Merge "[AWARE] Update network creation tests open/encrypted API" am: 148f767737
am: fc1043e9ba

Change-Id: I4e6b2b31c292ae2044185bc206e6bd4f70446861
2017-03-10 17:20:29 +00:00
Etan Cohen
fc1043e9ba Merge "[AWARE] Update network creation tests open/encrypted API"
am: 148f767737

Change-Id: Ib53b7a4c921c56c69402fc7be9440cefb064e92b
2017-03-10 17:12:07 +00:00
Etan Cohen
9602110a36 [AWARE] Update network creation tests open/encrypted API
Updated/add CTS tests to validate createNetworkSpecifierXxx
API for open and passphrase modules. As these are (still)
single-ended CTS tests - they validate failure.

Bug: 26564544
Test: CTS passing
Change-Id: I07b76bee5a9b73780d341ac8511a2738ded751ca
2017-03-08 09:08:00 -08:00
Etan Cohen
a268f3e3b0 Merge "[AWARE] CTS for Aware data-path creation" am: 8ee5d70b27
am: 5191f48899

Change-Id: I6d636951a698e79180943969a1c741b9235d1f9d
2017-03-07 23:48:39 +00:00
Etan Cohen
8171b2c1b5 Merge "[AWARE] CTS for failure mode of send message API" am: f138c95d1f
am: 3ceb23d6ca

Change-Id: I32956bbfd809dd92a1062b868dbb66377210ef02
2017-03-07 23:48:05 +00:00
Etan Cohen
c96112a907 Merge "[AWARE] CTS tests for publish/subscribe discovery" am: 32e2012c2a
am: 0d96fc6fd5

Change-Id: I6515e5f7707acc31cfffaf63d78c993983adaf1e
2017-03-07 23:47:36 +00:00
Etan Cohen
5191f48899 Merge "[AWARE] CTS for Aware data-path creation"
am: 8ee5d70b27

Change-Id: Ia9e4190416c8a93a62678e32d59daf9602da748f
2017-03-07 23:44:19 +00:00
Etan Cohen
3ceb23d6ca Merge "[AWARE] CTS for failure mode of send message API"
am: f138c95d1f

Change-Id: Ia317d9c3cadbe8d42ce7f26b0f1e96665611ffe4
2017-03-07 23:43:48 +00:00
Etan Cohen
0d96fc6fd5 Merge "[AWARE] CTS tests for publish/subscribe discovery"
am: 32e2012c2a

Change-Id: Ib7856de088d229ee6346bd94c279000ce041cb74
2017-03-07 23:43:18 +00:00
Etan Cohen
8ee5d70b27 Merge "[AWARE] CTS for Aware data-path creation" 2017-03-07 23:36:19 +00:00
Etan Cohen
f138c95d1f Merge "[AWARE] CTS for failure mode of send message API" 2017-03-07 23:35:47 +00:00
Etan Cohen
32e2012c2a Merge "[AWARE] CTS tests for publish/subscribe discovery" 2017-03-07 23:35:32 +00:00
Etan Cohen
12be803cce [AWARE] CTS for Aware data-path creation
Test Aware data-path creation API flow - failure.

Note: testing limited to failure since single device
testing doesn't have a peer

Bug: 30556108
Test: CTS tests pass
Change-Id: Ie15ad57d7331b21fbb6706091691bd5f87e1264e
2017-03-07 09:41:04 -08:00
Etan Cohen
ab5186e4f6 [AWARE] CTS for failure mode of send message API
Test that sending a message with invalid peer handle (null)
fails as expected.

Note: limited testing
- Single device testing doesn't have a peer
- Cannot create an invalid peer handle since opaque object

Bug: 30556108
Test: CTS tests pass
Change-Id: I72f4b67ea3c3dfc00aa48f6601d064b406dabde7
2017-03-07 09:33:00 -08:00
Etan Cohen
a9f33d578d [AWARE] CTS tests for publish/subscribe discovery
Validate the SUCCESS case of publish and subscribe
discovery sessions.

Bug: 30556108
Test: CTS tests pass
Change-Id: Ib88606cdf662560258890e2f274c85c3a8818206
2017-03-07 09:32:56 -08:00
Etan Cohen
53da30e8fe Merge "[CM] CTS tests for requestNetwork APIs" am: b9af841386
am: 766fa1f462

Change-Id: I0369c1d25f32ea2abd040482fcf97bdc43b3eb57
2017-03-07 16:54:51 +00:00
Etan Cohen
766fa1f462 Merge "[CM] CTS tests for requestNetwork APIs"
am: b9af841386

Change-Id: I167c41950ed8a7d267965088a391b7f503decd0d
2017-03-07 16:48:44 +00:00
Etan Cohen
b9af841386 Merge "[CM] CTS tests for requestNetwork APIs" 2017-03-07 16:40:27 +00:00
Etan Cohen
87b18c3df1 [CM] CTS tests for requestNetwork APIs
Add CTS tests for:
- requestNetwork API: test onAvailable
- requestNetwork with timeout API: test onUnavailable (failure)

Bug: 31399536
Test: CTS tests passing
Change-Id: I3565ef375ec90f90b2c76aabee14bf993251eeef
2017-03-06 20:45:13 -08:00
Etan Cohen
59239876dd Merge changes I8c2d29be,Ibbc58c3e am: 831196440e
am: a8824acb8c

Change-Id: I53a6272b9f78912553bd061c503d12db2d1c45c9
2017-03-07 04:42:31 +00:00
Etan Cohen
a8824acb8c Merge changes I8c2d29be,Ibbc58c3e
am: 831196440e

Change-Id: I076e52cdf6e46f1df055de0bfe9583d72f3fd181
2017-03-07 04:40:34 +00:00
Etan Cohen
831196440e Merge changes I8c2d29be,Ibbc58c3e
* changes:
  [AWARE] CTS for attaching to session + MAC address
  [AWARE] Initial CTS: availability API + broadcast
2017-03-07 04:37:19 +00:00
Etan Cohen
08a2758524 [AWARE] CTS for attaching to session + MAC address
Add CTS to verify initial session attach:
- Basic attach
- Attach with identity callback: use to verify MAC
  address change on subsequent attach.

Bug: 30556108
Test: CTS tests pass/fail per expectations
Change-Id: I8c2d29be81bef600a2c9eac99868326473d72b6e
2017-03-06 13:45:49 -08:00
Etan Cohen
5dc4e9b091 [AWARE] Initial CTS: availability API + broadcast
Initial CTS tests for Wi-Fi Aware:
- Add CTS test class for Wi-Fi Aware
- Setup/initialize
- Test the availablity API + broadcast

Bug: 30556108
Test: builds, CTS runs (test fails as expected)
Change-Id: Ibbc58c3ed7a9ad7312864d038fd34c7202222e82
2017-03-06 13:44:50 -08:00
Peter Qiu
b8a54f25bf Merge "wifi: add CTS tests for Passpoint parsing APIs" am: 66d2bf1fe9
am: 8376afc701

Change-Id: I7865133af1a2eb56a98bf8e1a8f74f225a9ba925
2017-03-06 00:15:19 +00:00
Peter Qiu
8376afc701 Merge "wifi: add CTS tests for Passpoint parsing APIs"
am: 66d2bf1fe9

Change-Id: I5425769dded37bf0f12e3f7622df17a2f69feb18
2017-03-06 00:11:49 +00:00
Peter Qiu
4175949b89 Merge "WifiManagerTest: add tests for verifying Passpoint configuration management APIs" am: c0d0ca8fe0
am: bf9f0f98b6

Change-Id: Ib1e40d62079e9341ac01f34fe9d5cf7f9759ac99
2017-03-03 17:28:35 +00:00
Peter Qiu
bf9f0f98b6 Merge "WifiManagerTest: add tests for verifying Passpoint configuration management APIs"
am: c0d0ca8fe0

Change-Id: I07dfbfdb705efbf8070a3282bbb31d909698512a
2017-03-03 17:26:06 +00:00
Peter Qiu
24a0a8e643 wifi: add CTS tests for Passpoint parsing APIs
Added a test for PPS MO (PerProviderSubscription Management Object)
tree parsing API and a test for Release 1 installation file
parsing API.

Bug: 35756298
Test: run the newly added PpsMoParserTest and ConfigParserTest

Change-Id: I6da40bef9609830afb80d8562e5bfb051920b541
2017-02-28 13:43:45 -08:00
Peter Qiu
485adf65b6 WifiManagerTest: add tests for verifying Passpoint configuration management APIs
Bug: 35756298
Test: run WifiManagerTest
Change-Id: I3d106ca9dd4ea74de91c6553eb285534a7856363
2017-02-27 13:57:55 -08:00
Android Build Merger (Role)
98b91c958c Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40 am: 1760c2406a am: b2ecabdbe3 am: 481142bda3" into nyc-mr2-dev-plus-aosp 2017-02-21 19:24:26 +00:00
Bjoern Johansson
c618553064 Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40 am: 1760c2406a am: b2ecabdbe3
am: 481142bda3

Change-Id: Ifd13589f3f5c9906b8091cd52515d8db658bb873
2017-02-21 19:24:02 +00:00
Bjoern Johansson
250da2bafd Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40"
am: e8fc6640f0

Change-Id: Id93567f78ce4490b1c015d65246b88f4f82f7f9a
2017-02-21 19:19:36 +00:00
Bjoern Johansson
b2ecabdbe3 Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40
am: 1760c2406a

Change-Id: Ic53b6307d2a74440e26be915cef13ab7716611cb
2017-02-21 19:17:53 +00:00
Bjoern Johansson
1760c2406a Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev
am: 4acb742c40

Change-Id: I519a864a1435825f86c9c296c615061e96af2a00
2017-02-21 19:13:11 +00:00
Android Merger
e8fc6640f0 Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40" 2017-02-21 19:13:04 +00:00
Bjoern Johansson
e711648651 Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev
am: 4acb742c40

Change-Id: I06e42332244bdec51588491d73a0f78950e546a8
2017-02-21 19:12:57 +00:00
Bjoern Johansson
067cdc6be2 Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba
am: 5b0a9ff797

Change-Id: Ie27b0e3835ccd22ad8a96a86ddb71da0134e9372
2017-02-16 23:29:24 +00:00
Bjoern Johansson
6a0c8bc950 Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba
am: 5717d105fb

Change-Id: Ibb393dbff3b7c1534958312c4bcd31ddb155dbde
2017-02-16 23:28:30 +00:00
Bjoern Johansson
5b0a9ff797 Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7
am: 11076c3eba

Change-Id: I77e30b9ff5bc30869c40a03c6655fd6471caa37c
2017-02-16 23:19:31 +00:00
Bjoern Johansson
11076c3eba Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev
am: a888e825f7

Change-Id: Ia63071dbcdd927781f9412123d065309edccb733
2017-02-16 23:11:03 +00:00
Bjoern Johansson
65085b1fcd resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev
Change-Id: Ic1e35bab2f426fabf4b15b1e60b186124778c9a8
2017-02-14 18:46:59 -08:00
Bjoern Johansson
959d02c19b resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev
Change-Id: Ie0b71a29966154a8590b3e4749f7713acaab0325
2017-02-14 18:24:01 -08:00