diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-07 21:43:07 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-07 21:43:07 +0000 |
| commit | ef1b71e21270dcb334e577dab3a9e51321daff5f (patch) | |
| tree | dc3f6afae5d7a5e01c7f0f613adb32815329ed74 | |
| parent | 103dbe38dd05c96467473b48b0a4d81a669d0558 (diff) | |
| parent | a4a8e36ee17fc1adfb60acaef014589a5ca326b9 (diff) | |
| download | tests-ef1b71e21270dcb334e577dab3a9e51321daff5f.tar.gz | |
Snap for 5450365 from a4a8e36ee17fc1adfb60acaef014589a5ca326b9 to pi-platform-release
Change-Id: I8a9db7451aa54fb34f30aa330ba4a57f2ce694db
| -rw-r--r--[-rwxr-xr-x] | net/test/anycast_test.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/test/anycast_test.py b/net/test/anycast_test.py index 82130db..6222580 100755..100644 --- a/net/test/anycast_test.py +++ b/net/test/anycast_test.py @@ -93,7 +93,14 @@ class AnycastTest(multinetwork_base.MultiNetworkBaseTest): # This will hang if the kernel has the bug. thread = CloseFileDescriptorThread(self.tuns[netid]) thread.start() - time.sleep(0.1) + # Wait up to 3 seconds for the thread to finish, but + # continue and fail the test if the thread hangs. + + # 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] |