chore(orca): Update to latest version to pickup improved behavior on …

…control flow join. (#90)
spinnaker · Sep 19, 2017 · ce0b754 · ce0b754
1 parent 066d3fd
commit ce0b754
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,5 +2,5 @@ springVersion=4.3.10.RELEASE
 springBootVersion=1.5.4.RELEASE
 kotlinVersion=1.1.2
 korkVersion=1.100.0
-orcaVersion=3.11.8
+orcaVersion=3.14.1
 spectatorVersion=0.57.1
diff --git a/kayenta-orca/src/test/java/com/netflix/kayenta/orca/lib/OrcaAsLibIntegrationTest.java b/kayenta-orca/src/test/java/com/netflix/kayenta/orca/lib/OrcaAsLibIntegrationTest.java
@@ -24,6 +24,7 @@
 import com.netflix.spinnaker.kork.eureka.RemoteStatusChangedEvent;
 import com.netflix.spinnaker.orca.ExecutionStatus;
 import com.netflix.spinnaker.orca.TaskResult;
+import com.netflix.spinnaker.orca.config.OrcaConfiguration;
 import com.netflix.spinnaker.orca.exceptions.DefaultExceptionHandler;
 import com.netflix.spinnaker.orca.pipeline.RestrictExecutionDuringTimeWindow;
 import com.netflix.spinnaker.orca.pipeline.StageDefinitionBuilder;
@@ -49,23 +50,26 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.time.Duration;
 
 import static com.netflix.appinfo.InstanceInfo.InstanceStatus.OUT_OF_SERVICE;
 import static com.netflix.appinfo.InstanceInfo.InstanceStatus.STARTING;
 import static com.netflix.appinfo.InstanceInfo.InstanceStatus.UP;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {TestConfig.class})
+@SpringBootTest(classes = {TestConfig.class})
+@RunWith(SpringRunner.class)
 public class OrcaAsLibIntegrationTest {
 
   Logger log = LoggerFactory.getLogger(OrcaAsLibIntegrationTest.class);
@@ -141,7 +145,8 @@ public void canRunASimplePipeline() {
   EmbeddedRedisConfiguration.class,
   JedisExecutionRepository.class,
   StageNavigator.class,
-  RestrictExecutionDuringTimeWindow.class
+  RestrictExecutionDuringTimeWindow.class,
+  OrcaConfiguration.class
 })
 
 class TestConfig {