diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-17 23:03:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-17 23:03:46 +0000 |
| commit | 0108c8604d5d1447cd2d5015b60bbdca2afa9c9e (patch) | |
| tree | dc3f6afae5d7a5e01c7f0f613adb32815329ed74 | |
| parent | 0f958a1f7a0a6ed575836bdf83d959327dfa9936 (diff) | |
| parent | a4a8e36ee17fc1adfb60acaef014589a5ca326b9 (diff) | |
| download | tests-0108c8604d5d1447cd2d5015b60bbdca2afa9c9e.tar.gz | |
Snap for 5186866 from a4a8e36ee17fc1adfb60acaef014589a5ca326b9 to pi-b4s4-releaseandroid-9.0.0_r39android-9.0.0_r38pie-b4s4-release
Change-Id: Iebf78b90314a1b3bfb7cee60a4f960822d476954
| -rw-r--r--[-rwxr-xr-x] | net/test/anycast_test.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/test/anycast_test.py b/net/test/anycast_test.py index 62d874e..6222580 100755..100644 --- a/net/test/anycast_test.py +++ b/net/test/anycast_test.py @@ -93,9 +93,14 @@ class AnycastTest(multinetwork_base.MultiNetworkBaseTest): # This will hang if the kernel has the bug. thread = CloseFileDescriptorThread(self.tuns[netid]) thread.start() - # Wait up to 0.5 seconds for the thread to finish, but + # Wait up to 3 seconds for the thread to finish, but # continue and fail the test if the thread hangs. - thread.join(0.5) + + # For kernels with MPTCP ported, closing tun interface need more + # than 0.5 sec. DAD procedure within MPTCP fullmesh module takes + # more time, because duplicate address-timer takes a refcount + # on the IPv6-address, preventing it from getting closed. + thread.join(3) # Make teardown work. del self.tuns[netid] |