From b2b7e4cf8ddf8331180b4ac3c764d3287e620d35 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 14 Aug 2017 10:41:17 -0700 Subject: [PATCH] Fix suspected race condition in test code --- .../org/springframework/ide/vscode/bosh/BoshEditorTest.java | 2 +- .../commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java index f73163268..207898cac 100644 --- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java +++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java @@ -151,10 +151,10 @@ public class BoshEditorTest { } @Test public void reconcileCfManifest() throws Exception { - Editor editor = harness.newEditorFromClasspath("/workspace/cf-deployment-manifest.yml"); cloudConfigProvider.executeCommandWith(() -> { throw new IOException("Couldn't contact the director"); }); + Editor editor = harness.newEditorFromClasspath("/workspace/cf-deployment-manifest.yml"); editor.assertProblems(/*NONE*/); } diff --git a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java index e78013f14..14fcd34a3 100644 --- a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java +++ b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java @@ -55,7 +55,6 @@ import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema; import org.springframework.ide.vscode.commons.yaml.schema.constraints.Constraint; import org.springframework.ide.vscode.commons.yaml.snippet.SchemaBasedSnippetGenerator; import org.springframework.ide.vscode.commons.yaml.snippet.Snippet; -import org.springframework.ide.vscode.commons.yaml.snippet.TypeBasedSnippetProvider; import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.NodeId;