Merge branch 'main' into ignore-cdktf-log-on-init

hashicorp · Jun 4, 2021 · f086b48 · f086b48
2 parents ac809fc + ca47534
commit f086b48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/cdktf-cli/bin/cmds/ui/terraform-context.tsx b/packages/cdktf-cli/bin/cmds/ui/terraform-context.tsx
@@ -62,7 +62,7 @@ const parseOutput = (str: string): DeployingResource[] => {
         applyState = DeployingResourceApplyState.DESTROYED
         break;
       default:
-        applyState = DeployingResourceApplyState.WAITING
+        return
     }
 
     if (resourceMatch && resourceMatch.length >= 0 && resourceMatch[1] != "Warning") {

diff --git a/test/jest.setup.js b/test/jest.setup.js
@@ -1,7 +1,7 @@
 // set a generous global timeout for beforeAll hooks as jest does run the tests anyway even
 // if the hook timeout out. This produces weird errors that are hard to trace down
 // for reference: https://github.com/facebook/jest/issues/9527
-const DEFAULT_TIMEOUT = 300000;
+const DEFAULT_TIMEOUT = 500000;
 let originalBeforeAll = global.beforeAll;
 global.beforeAll = function beforeAllWithDefaultTimeout(setup, timeout = DEFAULT_TIMEOUT) {
     return originalBeforeAll(setup, timeout);