Avoid ignoring interrupts in testsuite (#12958)

normanmaurer · web-flow · commit e1437fb468c5 · 2022-11-03T08:28:56.000+01:00
Motivation:
JUnit relies on interrupts to communicate test timeouts.
When we silently swallow interrupts, we break this mechanism.

Modification:
Make the loops in the testsuite throw their interrupts instead of silently swallowing them.

Result:
The tests now responds to timeouts.
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
@@ -119,11 +119,7 @@ public void initChannel(SctpChannel c) throws Exception {
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         while (sh.counter < data.length) {
@@ -134,11 +130,7 @@ public void initChannel(SctpChannel c) throws Exception {
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         sh.channel.close().sync();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketCancelWriteTest.java
@@ -77,11 +77,7 @@ public void testCancelWrite(ServerBootstrap sb, Bootstrap cb) throws Throwable {
             if (ch.exception.get() != null) {
                 break;
             }
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException ignore) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
         sh.channel.close().sync();
         ch.channel.close().sync();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
@@ -219,11 +219,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         while (sh.counter < data.length) {
@@ -234,11 +230,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         sh.channel.close().sync();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java
@@ -243,11 +243,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         sh.channel.close().sync();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java
@@ -109,11 +109,7 @@ public void initChannel(Channel sch) throws Exception {
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         while (sh.counter < data.length) {
@@ -124,11 +120,7 @@ public void initChannel(Channel sch) throws Exception {
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         sh.channel.close().sync();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java
@@ -120,11 +120,7 @@ public void initChannel(Channel sch) throws Exception {
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         while (sh.counter < data.length) {
@@ -135,11 +131,7 @@ public void initChannel(Channel sch) throws Exception {
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         sh.channel.close().sync();
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
@@ -220,11 +220,7 @@ public void initChannel(SocketChannel channel) throws Exception {
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSpliceTest.java
@@ -150,11 +150,7 @@ public void operationComplete(ChannelFuture future) throws Exception {
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         while (sh.counter < data.length) {
@@ -165,11 +161,7 @@ public void operationComplete(ChannelFuture future) throws Exception {
                 break;
             }
 
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         sh.channel.close().sync();
@@ -223,11 +215,7 @@ public void spliceToFile() throws Throwable {
             if (sh.exception.get() != null) {
                 break;
             }
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
+            Thread.sleep(50);
         }
 
         sc.close().sync();

Original file line number	Diff line number	Diff line change
`@@ -119,11 +119,7 @@ public void initChannel(SctpChannel c) throws Exception {`
`119`	`119`	`break;`
`120`	`120`	`}`
`121`	`121`
`122`		`- try {`
`123`		`- Thread.sleep(50);`
`124`		`- } catch (InterruptedException e) {`
`125`		`- // Ignore.`
`126`		`- }`
	`122`	`+ Thread.sleep(50);`
`127`	`123`	`}`
`128`	`124`
`129`	`125`	`while (sh.counter < data.length) {`
`@@ -134,11 +130,7 @@ public void initChannel(SctpChannel c) throws Exception {`
`134`	`130`	`break;`
`135`	`131`	`}`
`136`	`132`
`137`		`- try {`
`138`		`- Thread.sleep(50);`
`139`		`- } catch (InterruptedException e) {`
`140`		`- // Ignore.`
`141`		`- }`
	`133`	`+ Thread.sleep(50);`
`142`	`134`	`}`
`143`	`135`
`144`	`136`	`sh.channel.close().sync();`
Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,7 @@ public void testCancelWrite(ServerBootstrap sb, Bootstrap cb) throws Throwable {`
`77`	`77`	`if (ch.exception.get() != null) {`
`78`	`78`	`break;`
`79`	`79`	`}`
`80`		`- try {`
`81`		`- Thread.sleep(50);`
`82`		`- } catch (InterruptedException ignore) {`
`83`		`- // Ignore.`
`84`		`- }`
	`80`	`+ Thread.sleep(50);`
`85`	`81`	`}`
`86`	`82`	`sh.channel.close().sync();`
`87`	`83`	`ch.channel.close().sync();`
Original file line number	Diff line number	Diff line change
`@@ -219,11 +219,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E`
`219`	`219`	`break;`
`220`	`220`	`}`
`221`	`221`
`222`		`- try {`
`223`		`- Thread.sleep(50);`
`224`		`- } catch (InterruptedException e) {`
`225`		`- // Ignore.`
`226`		`- }`
	`222`	`+ Thread.sleep(50);`
`227`	`223`	`}`
`228`	`224`
`229`	`225`	`while (sh.counter < data.length) {`
`@@ -234,11 +230,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E`
`234`	`230`	`break;`
`235`	`231`	`}`
`236`	`232`
`237`		`- try {`
`238`		`- Thread.sleep(50);`
`239`		`- } catch (InterruptedException e) {`
`240`		`- // Ignore.`
`241`		`- }`
	`233`	`+ Thread.sleep(50);`
`242`	`234`	`}`
`243`	`235`
`244`	`236`	`sh.channel.close().sync();`
Original file line number	Diff line number	Diff line change
`@@ -243,11 +243,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E`
`243`	`243`	`break;`
`244`	`244`	`}`
`245`	`245`
`246`		`- try {`
`247`		`- Thread.sleep(50);`
`248`		`- } catch (InterruptedException e) {`
`249`		`- // Ignore.`
`250`		`- }`
	`246`	`+ Thread.sleep(50);`
`251`	`247`	`}`
`252`	`248`
`253`	`249`	`sh.channel.close().sync();`
Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,7 @@ public void initChannel(Channel sch) throws Exception {`
`109`	`109`	`break;`
`110`	`110`	`}`
`111`	`111`
`112`		`- try {`
`113`		`- Thread.sleep(50);`
`114`		`- } catch (InterruptedException e) {`
`115`		`- // Ignore.`
`116`		`- }`
	`112`	`+ Thread.sleep(50);`
`117`	`113`	`}`
`118`	`114`
`119`	`115`	`while (sh.counter < data.length) {`
`@@ -124,11 +120,7 @@ public void initChannel(Channel sch) throws Exception {`
`124`	`120`	`break;`
`125`	`121`	`}`
`126`	`122`
`127`		`- try {`
`128`		`- Thread.sleep(50);`
`129`		`- } catch (InterruptedException e) {`
`130`		`- // Ignore.`
`131`		`- }`
	`123`	`+ Thread.sleep(50);`
`132`	`124`	`}`
`133`	`125`
`134`	`126`	`sh.channel.close().sync();`
Original file line number	Diff line number	Diff line change
`@@ -120,11 +120,7 @@ public void initChannel(Channel sch) throws Exception {`
`120`	`120`	`break;`
`121`	`121`	`}`
`122`	`122`
`123`		`- try {`
`124`		`- Thread.sleep(50);`
`125`		`- } catch (InterruptedException e) {`
`126`		`- // Ignore.`
`127`		`- }`
	`123`	`+ Thread.sleep(50);`
`128`	`124`	`}`
`129`	`125`
`130`	`126`	`while (sh.counter < data.length) {`
`@@ -135,11 +131,7 @@ public void initChannel(Channel sch) throws Exception {`
`135`	`131`	`break;`
`136`	`132`	`}`
`137`	`133`
`138`		`- try {`
`139`		`- Thread.sleep(50);`
`140`		`- } catch (InterruptedException e) {`
`141`		`- // Ignore.`
`142`		`- }`
	`134`	`+ Thread.sleep(50);`
`143`	`135`	`}`
`144`	`136`
`145`	`137`	`sh.channel.close().sync();`
Original file line number	Diff line number	Diff line change
`@@ -220,11 +220,7 @@ public void initChannel(SocketChannel channel) throws Exception {`
`220`	`220`	`break;`
`221`	`221`	`}`
`222`	`222`
`223`		`- try {`
`224`		`- Thread.sleep(50);`
`225`		`- } catch (InterruptedException e) {`
`226`		`- // Ignore.`
`227`		`- }`
	`223`	`+ Thread.sleep(50);`
`228`	`224`	`}`
`229`	`225`
`230`	`226`	`if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {`
Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,7 @@ public void operationComplete(ChannelFuture future) throws Exception {`
`150`	`150`	`break;`
`151`	`151`	`}`
`152`	`152`
`153`		`- try {`
`154`		`- Thread.sleep(50);`
`155`		`- } catch (InterruptedException e) {`
`156`		`- // Ignore.`
`157`		`- }`
	`153`	`+ Thread.sleep(50);`
`158`	`154`	`}`
`159`	`155`
`160`	`156`	`while (sh.counter < data.length) {`
`@@ -165,11 +161,7 @@ public void operationComplete(ChannelFuture future) throws Exception {`
`165`	`161`	`break;`
`166`	`162`	`}`
`167`	`163`
`168`		`- try {`
`169`		`- Thread.sleep(50);`
`170`		`- } catch (InterruptedException e) {`
`171`		`- // Ignore.`
`172`		`- }`
	`164`	`+ Thread.sleep(50);`
`173`	`165`	`}`
`174`	`166`
`175`	`167`	`sh.channel.close().sync();`
`@@ -223,11 +215,7 @@ public void spliceToFile() throws Throwable {`
`223`	`215`	`if (sh.exception.get() != null) {`
`224`	`216`	`break;`
`225`	`217`	`}`
`226`		`- try {`
`227`		`- Thread.sleep(50);`
`228`		`- } catch (InterruptedException e) {`
`229`		`- // Ignore.`
`230`		`- }`
	`218`	`+ Thread.sleep(50);`
`231`	`219`	`}`
`232`	`220`
`233`	`221`	`sc.close().sync();`