markusthoemmes commented on a change in pull request #3219: Kubernetes ContainerFactoryProvider implementation URL: https://github.com/apache/incubator-openwhisk/pull/3219#discussion_r169579027
########## File path: tests/src/test/scala/whisk/core/containerpool/kubernetes/test/KubernetesClientTests.scala ########## @@ -0,0 +1,272 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package whisk.core.containerpool.kubernetes.test + +import java.time.LocalDateTime + +import akka.actor.ActorSystem +import akka.stream.ActorMaterializer +import akka.stream.scaladsl.{Concat, Flow, Framing, Sink, Source} +import akka.util.ByteString + +import scala.concurrent.Await +import scala.concurrent.ExecutionContext +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.Future +import scala.concurrent.duration._ +import spray.json._ +import org.junit.runner.RunWith +import org.scalatest.BeforeAndAfterEach +import org.scalatest.concurrent.Eventually +import org.scalatest.FlatSpec +import org.scalatest.junit.JUnitRunner +import org.scalatest.Matchers +import org.scalatest.time.{Seconds, Span} +import common.{StreamLogging, WskActorSystem} +import okio.Buffer +import whisk.common.LogMarker +import whisk.common.LoggingMarkers.INVOKER_KUBECTL_CMD +import whisk.common.TransactionId +import whisk.core.containerpool.{ContainerAddress, ContainerId} +import whisk.core.containerpool.kubernetes.{KubernetesApi, KubernetesClient, KubernetesRestLogSourceStage} +import whisk.core.containerpool.docker.ProcessRunningException +import whisk.core.containerpool.logging.LogLine + +import scala.collection.mutable +import scala.util.Try +@RunWith(classOf[JUnitRunner]) +class KubernetesClientTests + extends FlatSpec + with Matchers + with StreamLogging + with BeforeAndAfterEach + with Eventually + with WskActorSystem { + + import KubernetesClientTests._ + + implicit val materializer: ActorMaterializer = ActorMaterializer() + + /** Reads logs into memory and awaits them */ + def awaitLogs(source: Source[ByteString, Any], timeout: FiniteDuration = 1000.milliseconds): Vector[LogLine] = + Await + .result( + source + .via(Framing.delimiter(ByteString("\n"), 1024)) + .via(Flow[ByteString].map(l => Try(l.utf8String.parseJson.convertTo[LogLine]).getOrElse(LogLine("", "", "")))) + .filter(_ != LogLine("", "", "")) Review comment: Why not `mapConcat(l => Try(l.utf8String.parseJson.convertTo[LogLine])` and drop the following filter? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
