X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandsTest2.java;h=ae14c1ae922737c78e2cadb2210efb6a8f5a3f0b;hb=6d3348aa17d3bd5c9b3f028d97b9dde965e4a78c;hp=0c2071a70923a13a3ec0cdfe66276545179d9ae6;hpb=2b5c2dd88dd2f087fdf61427e59704d7bf05d627;p=jalview.git

diff --git a/test/jalview/bin/CommandsTest2.java b/test/jalview/bin/CommandsTest2.java
index 0c2071a..ae14c1a 100644
--- a/test/jalview/bin/CommandsTest2.java
+++ b/test/jalview/bin/CommandsTest2.java
@@ -65,14 +65,19 @@ public class CommandsTest2
     String[] args = cmdLine.split("\\s+");
 
     CommandsTest.callJalviewMain(args);
-    try
+    while (Desktop.instance != null
+            && Desktop.instance.operationsAreInProgress())
     {
-      // sleep for slow build server to open annotations and viewer windows
-      Thread.sleep(seqNum * 50 + annNum * 50 + viewerNum * 500);
-    } catch (InterruptedException e)
-    {
-      e.printStackTrace();
+      try
+      {
+        // sleep for slow build server to open annotations and viewer windows
+        Thread.sleep(viewerNum * 50);
+      } catch (InterruptedException e)
+      {
+        e.printStackTrace();
+      }
     }
+    ;
 
     AlignFrame[] afs = Desktop.getAlignFrames();
     Assert.assertNotNull(afs);