From bb50c3f3c943ea85d49df160d45f8edea0005d10 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 20 Nov 2015 16:56:25 +0100 Subject: [PATCH] [System] Tweak tests to work with Thread.Interrupt as well. --- mcs/class/System/Test/System.Net/SocketResponder.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mcs/class/System/Test/System.Net/SocketResponder.cs b/mcs/class/System/Test/System.Net/SocketResponder.cs index 213f0b72d3f..af05477fb6b 100644 --- a/mcs/class/System/Test/System.Net/SocketResponder.cs +++ b/mcs/class/System/Test/System.Net/SocketResponder.cs @@ -137,6 +137,10 @@ namespace MonoTests.System.Net Console.WriteLine (ex); if (_state != STATE_STOPPED) throw; +#if !MONO_FEATURE_THREAD_ABORT + } catch (ThreadInterruptedException) { + break; +#endif #if MOBILE } catch (InvalidOperationException ex) { // This breaks some tests running on Android. The problem is that the stack trace @@ -146,7 +150,15 @@ namespace MonoTests.System.Net Console.WriteLine (ex); #endif } finally { +#if MONO_FEATURE_THREAD_ABORT Thread.Sleep (500); +#else + try { + Thread.Sleep (500); + } catch (ThreadInterruptedException) { + // nothing to do + } +#endif if (listenSocket != null) listenSocket.Close (); } -- 2.25.1