don't fail test due to timeout in tearDown when deleting project (#1076)

GoogleCloudPlatform · Dec 8, 2016 · 1205d85 · 1205d85
1 parent a56b4d9
commit 1205d85
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...engine/src/com/google/cloud/tools/eclipse/integration/appengine/AbstractProjectTests.java b/...engine/src/com/google/cloud/tools/eclipse/integration/appengine/AbstractProjectTests.java
@@ -23,6 +23,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
 import org.junit.After;
 import org.junit.BeforeClass;
 
@@ -48,7 +49,11 @@ public void tearDown() {
     if (project != null) {
       // ensure there are no jobs
       SwtBotWorkbenchActions.waitForIdle(bot);
-      SwtBotProjectActions.deleteProject(bot, project.getName());
+      try {
+        SwtBotProjectActions.deleteProject(bot, project.getName());
+      } catch (TimeoutException ex) {
+        // If this fails it shouldn't fail the test, which has already run
+      }
       project = null;
     }
     bot.resetWorkbench();

diff --git a/...google/cloud/tools/eclipse/integration/appengine/DebugNativeAppEngineStandardProject.java b/...google/cloud/tools/eclipse/integration/appengine/DebugNativeAppEngineStandardProject.java
@@ -74,8 +74,8 @@ public void testDebugLaunch() throws Exception {
         "app.engine.test");
     assertTrue(project.exists());
 
-    SWTBotTreeItem project = SwtBotProjectActions.selectProject(bot, "testapp");
-    assertNotNull(project);
+    SWTBotTreeItem testappProject = SwtBotProjectActions.selectProject(bot, "testapp");
+    assertNotNull(testappProject);
     SwtBotTestingUtilities.performAndWaitForWindowChange(bot, new Runnable() {
       @Override
       public void run() {

diff --git a/...gine/src/com/google/cloud/tools/eclipse/integration/appengine/DeployPropertyPageTest.java b/...gine/src/com/google/cloud/tools/eclipse/integration/appengine/DeployPropertyPageTest.java
@@ -28,7 +28,6 @@
 import org.junit.Test;
 
 public class DeployPropertyPageTest extends AbstractProjectTests {
-  // TODO: add tests for flex project when Create New Flex project wizard is available
   @Test
   public void testPropertyPageTitle_standardProject() throws CoreException {
     String projectName = "foo";