diff options
| author | yunsik.lee <yunsik.lee@lge.com> | 2018-12-16 21:09:23 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-16 21:09:23 -0800 |
| commit | a4a8e36ee17fc1adfb60acaef014589a5ca326b9 (patch) | |
| tree | dc3f6afae5d7a5e01c7f0f613adb32815329ed74 | |
| parent | 0d5028b3efa3fcc4d117843804e8c21d6e6c3ba6 (diff) | |
| parent | 4832bbb524111b0335d52b284b9566aeba668e3a (diff) | |
| download | tests-pie-b4s4-dev.tar.gz | |
anycast_test.py: increase waiting time to 3 sec to wait CloseFileDescriptorThread finishedandroid-9.0.0_r46android-9.0.0_r44android-9.0.0_r43android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releasepie-b4s4-dev
am: 4832bbb524
Change-Id: I645f26c5440cf1305eb3839a7dc662f4196efe89
| -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] |