This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 5a69e92 [TRAVIS] Retry platform/api.htmlui and platform/openide.explorer tests 5a69e92 is described below commit 5a69e9220535e8be5b1a9cb6176bd64b7a2a624f Author: Hector Espert <hectorespertpa...@gmail.com> AuthorDate: Sat Nov 30 19:53:40 2019 +0100 [TRAVIS] Retry platform/api.htmlui and platform/openide.explorer tests --- .travis.yml | 4 ++-- .../test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java | 4 ++-- .../test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java | 6 +++--- .../unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java | 8 ++++---- .../src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java | 2 +- .../src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java | 2 +- .../org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a93d91..8bf2051 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,7 +103,7 @@ matrix: - ant $OPTS clean - ant $OPTS build script: - - hide-logs.sh ant $OPTS -f platform/api.htmlui test + - travis_retry hide-logs.sh ant $OPTS -f platform/api.htmlui test - hide-logs.sh ant $OPTS -f platform/api.intent test - hide-logs.sh ant $OPTS -f platform/api.io test - hide-logs.sh ant $OPTS -f platform/api.progress test @@ -158,7 +158,7 @@ matrix: - hide-logs.sh ant $OPTS -f platform/openide.dialogs test - hide-logs.sh ant $OPTS -f platform/openide.execution test - hide-logs.sh ant $OPTS -f platform/openide.execution.compat8 test - - hide-logs.sh ant $OPTS -f platform/openide.explorer test + - travis_retry hide-logs.sh ant $OPTS -f platform/openide.explorer test - hide-logs.sh ant $OPTS -f platform/openide.filesystems test - hide-logs.sh ant $OPTS -f platform/openide.filesystems.compat8 test - hide-logs.sh ant $OPTS -f platform/openide.filesystems.nb test diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java index fde6139..65cdc51 100644 --- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java +++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java @@ -45,7 +45,7 @@ public class ComponentsTest { NbResloc.init(); } - @Test + @Test(timeOut = 9000) public void loadSwing() throws Exception { CountDownLatch cdl = new CountDownLatch(1); JComponent p = TestPages.getSwing(10, cdl); @@ -56,7 +56,7 @@ public class ComponentsTest { cdl.await(); } - @Test + @Test(timeOut = 9000) public void loadFX() throws Exception { final CountDownLatch cdl = new CountDownLatch(1); final CountDownLatch done = new CountDownLatch(1); diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java index c947db4..aeabeca 100644 --- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java +++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java @@ -45,7 +45,7 @@ public class DialogsTest { public DialogsTest() { } - @BeforeClass + @BeforeClass(timeOut = 9000) public static void initializeContext() throws Exception { final JFXPanel p = new JFXPanel(); final URL u = DialogsTest.class.getResource("/org/netbeans/api/htmlui/empty.html"); @@ -71,7 +71,7 @@ public class DialogsTest { f.setVisible(true); } - @Test + @Test(timeOut = 9000) public void parseButtons() throws Throwable { final Throwable[] ex = { null }; final JButton[] buttons = { null, null }; @@ -123,7 +123,7 @@ public class DialogsTest { }); } - @Test + @Test(timeOut = 9000) public void noDefinedButtonsMeanOKCancel() throws Throwable { final Throwable[] ex = { null }; final CountDownLatch done = new CountDownLatch(1); diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java index fe57aac..11e13f9 100644 --- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java +++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java @@ -46,7 +46,7 @@ public class HtmlComponentTest { public HtmlComponentTest() { } - @BeforeClass + @BeforeClass(timeOut = 9000) public static void initializeContext() throws Exception { final HtmlComponent tc = new HtmlComponent(); final URL u = HtmlComponent.class.getResource("/org/netbeans/api/htmlui/empty.html"); @@ -66,7 +66,7 @@ public class HtmlComponentTest { return cc; } - @Test + @Test(timeOut = 9000) public void updateContext() throws Exception { CheckContext cc = assertContext(); @@ -79,7 +79,7 @@ public class HtmlComponentTest { assertNull(lkp.lookup(DefCnstr.class), "Disappeared again"); } - @Test + @Test(timeOut = 9000) public void closedWhenRemoved() throws Exception { CheckContext cc = assertContext(); @@ -94,7 +94,7 @@ public class HtmlComponentTest { assertTrue(inst.closed, "Close has been called on removal"); } - @Test + @Test(timeOut = 9000) public void updateContextWithNonDefaultCnstr() throws Exception { CheckContext cc = assertContext(); diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java index b3787a6..aca0397 100644 --- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java +++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java @@ -46,7 +46,7 @@ public class OpenHTMLRegistrationTest { public static void main() { } - @Test + @Test(timeOut = 9000) public void verifyRegistered() { final String path = "Actions/Test/html-test.instance"; final FileObject fo = FileUtil.getConfigFile(path); diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java index 2bcf83f..4b1387e 100644 --- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java +++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java @@ -35,7 +35,7 @@ public class ShowDialogFromEDTTest implements Runnable { private CountDownLatch cdl; - @Test + @Test(timeOut = 9000) public void showDialog() throws InterruptedException { cdl = new CountDownLatch(1); EventQueue.invokeLater(this); diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java index 37eb2a4..b67d5cc 100644 --- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java +++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java @@ -36,7 +36,7 @@ import org.testng.annotations.Test; public class ShowDialogFromFXThreadTest implements Runnable { private volatile boolean returned; - @BeforeClass + @BeforeClass(timeOut = 9000) public static void initFX() { JFXPanel p = new JFXPanel(); JFrame f = new JFrame(); @@ -51,7 +51,7 @@ public class ShowDialogFromFXThreadTest implements Runnable { private volatile CountDownLatch cdl; - @Test + @Test(timeOut = 9000) public void showDialog() throws Exception { cdl = new CountDownLatch(1); Platform.runLater(this); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists