[Esbox-commits] r2037 - in branches/work_Ed: org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests org.maemo.esbox.tests/src/org/maemo/esbox/tests org.maemo.esbox.tests/src/org/maemo/esbox/tests/protocol

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-08-27 23:41:58 +0300 (Thu, 27 Aug 2009)
New Revision: 2037

Modified:
   branches/work_Ed/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/ESboxScratchboxTestSuite.java
   branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java
   branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/ESboxProductTestSuite.java
   branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/protocol/ManualTestSBRSHMachine.java
Log:
-- Make sure MachineUtils#acquireMachine() can be cancelled, by wrapping this in a ProgressMonitorDialog.  
-- Also, make sure that unit tests suite generation will fail when machine can't be acquired, rather than continuing

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/ESboxScratchboxTestSuite.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/ESboxScratchboxTestSuite.java	2009-08-27 20:36:23 UTC (rev 2036)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/ESboxScratchboxTestSuite.java	2009-08-27 20:41:58 UTC (rev 2037)
@@ -40,7 +40,9 @@
 				}
 			}
 		} catch (MicaException e) {
+			return TestSuite.warning("Could not connect to build machine");
 		}
+		
 		SDKManager.getInstance().waitForRefreshComplete(null);
 		
 		TestSuite suite = new TestSuite(

Modified: branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java	2009-08-27 20:36:23 UTC (rev 2036)
+++ branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java	2009-08-27 20:41:58 UTC (rev 2037)
@@ -43,6 +43,7 @@
 				}
 			}
 		} catch (MicaException e) {
+			return TestSuite.warning("Could not connect to build machine");
 		}
 		
 		suite.addTest(new JUnit4TestAdapter(TestOProfileValgrindSupport.class));

Modified: branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/ESboxProductTestSuite.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/ESboxProductTestSuite.java	2009-08-27 20:36:23 UTC (rev 2036)
+++ branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/ESboxProductTestSuite.java	2009-08-27 20:41:58 UTC (rev 2037)
@@ -14,6 +14,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.maemo.mica.common.core.ErrorLogger;
 import org.maemo.mica.common.core.MicaException;
+import org.maemo.mica.common.core.TimeoutProgressMonitor;
 import org.maemo.mica.common.core.ErrorLogger.Listener;
 import org.maemo.mica.common.core.machine.*;
 import org.maemo.mica.common.core.tests.TestMachineUtils;
@@ -29,19 +30,18 @@
 public class ESboxProductTestSuite {
 
 	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for ESbox Product");
-		
 		try {
 			IMachine testMachine = TestMachineUtils.getSSHBuildMachine();
 			if (testMachine != null) {
-				MachineUtils.acquireMachine(testMachine);
+				MachineUtils.acquireMachine(testMachine,
+						new TimeoutProgressMonitor(5 * 60 * 1000));
 			} else {
 				for (IBuildMachine machine : MachineRegistry.getInstance().getBuildMachines()) {
 					MachineUtils.acquireMachine(machine);
 				}
 			}
 		} catch (MicaException e) {
+			return TestSuite.warning("Could not connect to build machine");
 		}
 		
 		ErrorLogger.Listener listener = new Listener() {
@@ -57,7 +57,10 @@
 			
 		};
 		ErrorLogger.addListener(listener);
-		
+
+		TestSuite suite = new TestSuite(
+			"Test for ESbox Product");
+
 		suite.addTest(org.maemo.mica.common.core.tests.MicaCoreTestSuite.suite());
 		suite.addTest(org.maemo.esbox.internal.tests.ESboxMicaTestSuite.suite());
 		suite.addTest(org.maemo.esbox.vm.tests.ESboxVMTestSuite.suite());

Modified: branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/protocol/ManualTestSBRSHMachine.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/protocol/ManualTestSBRSHMachine.java	2009-08-27 20:36:23 UTC (rev 2036)
+++ branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/protocol/ManualTestSBRSHMachine.java	2009-08-27 20:41:58 UTC (rev 2037)
@@ -18,6 +18,7 @@
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.maemo.esbox.tests.common.SboxTestUtils;
 import org.maemo.mica.common.core.HostUtils;
@@ -69,7 +70,7 @@
 				// new QemuMachine(new StockQemuConfiguration());
 		else
 			sbrshHostMachine = MachineRegistry.getInstance().getLocalMachine();
-		MachineUtils.acquireMachine(sbrshHostMachine);
+		MachineUtils.acquireMachine(sbrshHostMachine, new NullProgressMonitor());
 		
 		SboxTestUtils.reset();
 		theSB1SDKTarget = SboxTestUtils.theSB1SDKTarget;