diff --git a/plugins/TestingList.java b/plugins/TestingList.java index dd97c5f..598daf9 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -1069,20 +1069,21 @@ public class TestingList extends Panel { private void jButtonRunActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonRunActionPerformed if (this.jButtonRun.getToolTipText().equals("Run enabled tests")) { Object pshellStatus; - String sWait = ""; + String sWait = "pshell is initialising: cannot start tests, please try again in a few seconds..."; + Boolean bWait = false; //check if pshell is still initialising: if so, don't start the tests try { //invoke python method pshellStatus = eval("controller.state"); if(String.valueOf(pshellStatus)=="Initializing"){ - sWait = "pshell is initialising: please try again in a few seconds..."; + bWait = true; } } catch (Exception ex) { Logger.getLogger(TestingList.class.getName()).log(Level.SEVERE, null, ex); - sWait = "pshell is initialising: please try again in a few seconds..."; + bWait = true; } //pshell is actually initialising: don't start tests - if(!sWait.isEmpty()){ + if(bWait){ System.out.println(sWait); return; } diff --git a/script/tests/tests.properties b/script/tests/tests.properties index 97dde0e..8b0a3e2 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Wed Jan 20 09:10:23 CET 2016 +#Wed Jan 20 09:16:17 CET 2016 customPanel= showEnabledTestsOnly=true listFilter=LabTests2