LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use random available port in CTS tests." am: 59d9f58467

Browse Source 
am: 1ffbf5accc

Change-Id: Idf5e8a928f6bdfe2e075d61ac0cf5866059ed39a
This commit is contained in:
Jonathan Basseri
2017-10-31 18:22:26 +00:00
committed by android-build-merger
parent 410168a364 382ea38fc0
commit 60b9bbdda1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/cts/net/src/android/net/cts/IpSecManagerTest.java
View File

@@ -155,8 +155,9 @@ public class IpSecManagerTest extends AndroidTestCase {
CRYPT_KEY.length * 8))
.buildTransportModeTransform(local);
// Hack to ensure the socket doesn't block indefinitely on failure
DatagramSocket localSocket = new DatagramSocket(8888);
// Bind localSocket to a random available port.
DatagramSocket localSocket = new DatagramSocket(0);
int localPort = localSocket.getLocalPort();
localSocket.setSoTimeout(500);
ParcelFileDescriptor pin = ParcelFileDescriptor.fromDatagramSocket(localSocket);
FileDescriptor udpSocket = pin.getFileDescriptor();
@@ -165,7 +166,7 @@ public class IpSecManagerTest extends AndroidTestCase {
byte[] data = new String("Best test data ever!").getBytes("UTF-8");
byte[] in = new byte[data.length];
Os.sendto(udpSocket, data, 0, data.length, 0, local, 8888);
Os.sendto(udpSocket, data, 0, data.length, 0, local, localPort);
Os.read(udpSocket, in, 0, in.length);
assertTrue("Encapsulated data did not match.", Arrays.equals(data, in));
mISM.removeTransportModeTransform(udpSocket, transform);