Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 13 insertions, 9 deletions

diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/live/TrelloIntegrationTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/live/TrelloIntegrationTest.java
index 3da6ad3d82d7..2f93b83bef09 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/live/TrelloIntegrationTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/live/TrelloIntegrationTest.java
@@ -29,16 +29,20 @@ public class TrelloIntegrationTest extends LiveIntegrationTestCase<TrelloReposit
 
   @Override
   protected TrelloRepository createRepository() throws Exception {
-    TrelloRepository repository = new TrelloRepository(new TrelloRepositoryType());
-    String token = System.getProperty("tasks.tests.trello.token");
-    if (StringUtil.isEmpty(token)) {
-      throw new AssertionError("Authorization token is not set");
+    try {
+      TrelloRepository repository = new TrelloRepository(new TrelloRepositoryType());
+      String token = System.getProperty("tasks.tests.trello.token");
+      assertTrue("Authorization token is not set", !StringUtil.isEmpty(token));
+      repository.setPassword(token);
+      TrelloUser user = repository.fetchUserByToken();
+      assertNotNull(user);
+      repository.setCurrentUser(user);
+      return repository;
+    }
+    catch (AssertionError ae){
+      tearDown();
+      throw ae;
     }
-    repository.setPassword(token);
-    TrelloUser user = repository.fetchUserByToken();
-    assertNotNull(user);
-    repository.setCurrentUser(user);
-    return repository;
   }
 
   // TODO Check closed tasks exclusion