chore(*): Rename time.kt to timeutil.kt to keep intelliJ happy (spinn…

…aker#2907) * chore(*): Rename time.kt to timeutil.kt to keep intelliJ happy * fix(tests): minor tweaks to tests * make `QueueIntegrationTest` abstract * extend the execution time to make travis better able to run the queue tests
sicp618 · May 10, 2019 · 7b21513 · 7b21513
1 parent c64753f
commit 7b21513
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/orca-queue-tck/src/main/kotlin/com/netflix/spinnaker/orca/q/ExecutionLatch.kt b/orca-queue-tck/src/main/kotlin/com/netflix/spinnaker/orca/q/ExecutionLatch.kt
@@ -43,7 +43,7 @@ class ExecutionLatch(private val predicate: Predicate<ExecutionComplete>)
     }
   }
 
-  fun await() = latch.await(1, TimeUnit.SECONDS)
+  fun await() = latch.await(2, TimeUnit.SECONDS)
 }
 
 fun ConfigurableApplicationContext.runToCompletion(execution: Execution, launcher: (Execution) -> Unit, repository: ExecutionRepository) {

diff --git a/orca-queue-tck/src/main/kotlin/com/netflix/spinnaker/orca/q/QueueIntegrationTest.kt b/orca-queue-tck/src/main/kotlin/com/netflix/spinnaker/orca/q/QueueIntegrationTest.kt
@@ -80,7 +80,7 @@ import java.time.temporal.ChronoUnit.HOURS
   properties = ["queue.retry.delay.ms=10"]
 )
 @RunWith(SpringRunner::class)
-class QueueIntegrationTest {
+abstract class QueueIntegrationTest {
 
   @Autowired
   lateinit var queue: Queue

diff --git a/...kotlin/com/netflix/spinnaker/time/Time.kt → ...n/com/netflix/spinnaker/time/TimeUtils.kt b/...kotlin/com/netflix/spinnaker/time/Time.kt → ...n/com/netflix/spinnaker/time/TimeUtils.kt
-Original file line number
+Diff line change
@@ Expand Up @@
         }
       }
-      fun await() = latch.await(1, TimeUnit.SECONDS)
+      fun await() = latch.await(2, TimeUnit.SECONDS)
     }
     fun ConfigurableApplicationContext.runToCompletion(execution: Execution, launcher: (Execution) -> Unit, repository: ExecutionRepository) {
@@ Expand Down @@