OSDN Git Service

Fix flaky UdpEncapsulationSocket test
authorLorenzo Colitti <lorenzo@google.com>
Thu, 4 Apr 2019 16:18:29 +0000 (09:18 -0700)
committerLorenzo Colitti <lorenzo@google.com>
Tue, 9 Apr 2019 06:44:32 +0000 (06:44 +0000)
commitf0d45503bc402c8dbfaa866c652d901c1bfd115a
tree326553a00ceceeb709309c2f7c8270e4a6e0825e
parent16f682cac6840e6fd760cd3a076a36c46042cf6c
Fix flaky UdpEncapsulationSocket test

This commit reduces the flakiness of the
testOpenAndCloseUdpEncapsulationSocket by retrying up to three times.
Unfortunately, testing port-selected socket creation is racy against
other applications. This helps to handle the same race condition as done
in IpSecService#bindToRandomPort

Bug: 128024100
Test: 200x runs of testOpenAndCloseUdpEncapsulationSocket
Change-Id: I7e036ce821019dbac6c50899bd0894e89d2fe82a
Merged-In: Idf040a67e53d9b9ec6e6c647ce24f8ada501d355
Merged-In: Iad9aea4b42cd8b31a5a2659bb9cb54dd1c64e8b7
(cherry picked from commit 614ab3dd4e49e9b664f5065983fb9067148fef12)
services/core/java/com/android/server/IpSecService.java
tests/net/java/com/android/server/IpSecServiceTest.java