From 513b887f6c9732dd4735fa7b51f64b2fe19815ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Sun, 16 Jan 2022 16:10:28 +0100
Subject: [PATCH] Add missing conflict resolves
---
.../execution/operator/TheodoliteOperator.kt | 4 ++--
.../execution/operator/ExecutionEventHandlerTest.kt | 12 ------------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteOperator.kt b/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteOperator.kt
index 62ddc478a..071bd0607 100644
--- a/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteOperator.kt
+++ b/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteOperator.kt
@@ -106,7 +106,7 @@ class TheodoliteOperator {
return executionStateHandler
}
- private fun getBenchmarkStateHandler(client: NamespacedKubernetesClient) : BenchmarkStateHandler {
+ fun getBenchmarkStateHandler(client: NamespacedKubernetesClient) : BenchmarkStateHandler {
if (!::benchmarkStateHandler.isInitialized) {
this.benchmarkStateHandler = BenchmarkStateHandler(client = client)
}
@@ -150,7 +150,7 @@ class TheodoliteOperator {
)
}
- private fun getBenchmarkClient(client: NamespacedKubernetesClient): MixedOperation<
+ fun getBenchmarkClient(client: NamespacedKubernetesClient): MixedOperation<
BenchmarkCRD,
KubernetesBenchmarkList,
Resource<BenchmarkCRD>> {
diff --git a/theodolite/src/test/kotlin/theodolite/execution/operator/ExecutionEventHandlerTest.kt b/theodolite/src/test/kotlin/theodolite/execution/operator/ExecutionEventHandlerTest.kt
index 16eeee83f..ec14d7d8f 100644
--- a/theodolite/src/test/kotlin/theodolite/execution/operator/ExecutionEventHandlerTest.kt
+++ b/theodolite/src/test/kotlin/theodolite/execution/operator/ExecutionEventHandlerTest.kt
@@ -44,18 +44,6 @@ class ExecutionEventHandlerTest {
@BeforeEach
fun setUp() {
server.before()
- val operator = TheodoliteOperator()
- this.controller = operator.getController(
- client = server.client,
- executionStateHandler = operator.getExecutionStateHandler(client = server.client),
- benchmarkStateChecker = operator.getBenchmarkStateChecker(client = server.client)
- )
-
- this.factory = operator.getExecutionEventHandler(this.controller, server.client)
- this.stateHandler = TheodoliteOperator().getExecutionStateHandler(client = server.client)
-
- this.executionVersion1 = K8sResourceLoaderFromFile(server.client)
- .loadK8sResource("Execution", testResourcePath + "test-execution.yaml")
this.server.client
.apiextensions().v1()
--
GitLab