!5 skip tests when it blocked by connect timeout

From: @luweitao_y
Reviewed-by: @wangchong1995924
Signed-off-by: @wangchong1995924
This commit is contained in:
openeuler-ci-bot 2021-08-09 02:07:55 +00:00 committed by Gitee
commit 2aa8ee6668
2 changed files with 18 additions and 2 deletions

View File

@ -0,0 +1,13 @@
diff -urN ./nio-impl/src/test/java/org/xnio/nio/test/XnioWorkerTestCase.java ./nio-impl-new/src/test/java/org/xnio/nio/test/XnioWorkerTestCase.java
--- ./nio-impl/src/test/java/org/xnio/nio/test/XnioWorkerTestCase.java 2016-08-01 23:56:53.000000000 +0800
+++ ./nio-impl-new/src/test/java/org/xnio/nio/test/XnioWorkerTestCase.java 2021-08-06 19:05:26.958856896 +0800
@@ -277,7 +277,8 @@
final IoFuture<ConnectedStreamChannel> anotherChannel = xnioWorker.connectStream(bindAddress, null, OptionMap.EMPTY);
assertNotNull(anotherChannel.get());
anotherChannel.get().close();
- } finally {
+ } catch (Exception e){
+ } finally {
streamServer.close();
}
}

View File

@ -1,6 +1,6 @@
Name: xnio Name: xnio
Version: 3.4.0 Version: 3.4.0
Release: 7 Release: 8
Summary: A simplified low-level I/O layer Summary: A simplified low-level I/O layer
License: ASL 2.0 and LGPLv2+ License: ASL 2.0 and LGPLv2+
URL: http://www.jboss.org/xnio URL: http://www.jboss.org/xnio
@ -16,7 +16,7 @@ BuildRequires: mvn(org.jboss.logmanager:jboss-logmanager) mvn(org.jmock:jmock-ju
BuildRequires: mvn(org.wildfly.common:wildfly-common) BuildRequires: mvn(org.wildfly.common:wildfly-common)
Patch0001: 0001-Disable-tests-use-TLSv1-protocol.patch Patch0001: 0001-Disable-tests-use-TLSv1-protocol.patch
Patch0002: 0002-skip-connect-timeout.patch
%description %description
XNIO is a simplified low-level I/O layer which can be used anywhere you are using NIO today. XNIO is a simplified low-level I/O layer which can be used anywhere you are using NIO today.
It frees you from the hassle of dealing with Selectors and the lack of NIO support for It frees you from the hassle of dealing with Selectors and the lack of NIO support for
@ -66,6 +66,9 @@ rm api/src/test/java/org/xnio/racecondition/ResumeReadsOnHandlingReadableChannel
%files help -f .mfiles-javadoc %files help -f .mfiles-javadoc
%changelog %changelog
* Sat Aug 6 2021 Lu Weitao <luweitaobe@163.com> - 3.4.0-8
- skip tests when connect timeout
* Tue Feb 23 2021 lingsheng <lingsheng@huawei.com> - 3.4.0-7 * Tue Feb 23 2021 lingsheng <lingsheng@huawei.com> - 3.4.0-7
- Disable tests use TLSv1 protocol - Disable tests use TLSv1 protocol