skonto commented on a change in pull request #23599: [SPARK-24793][K8s] Enhance spark-submit for app management URL: https://github.com/apache/spark/pull/23599#discussion_r268413222
########## File path: resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/submit/K8sSubmitOpSuite.scala ########## @@ -0,0 +1,159 @@ +/* + * 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 org.apache.spark.deploy.k8s.submit + +import java.io.PrintStream + +import scala.collection.JavaConverters._ + +import io.fabric8.kubernetes.api.model._ +import io.fabric8.kubernetes.client.KubernetesClient +import io.fabric8.kubernetes.client.dsl.PodResource +import org.mockito.{ArgumentMatchers, Mock, MockitoAnnotations} +import org.mockito.Mockito.{times, verify, when} +import org.scalatest.BeforeAndAfter + +import org.apache.spark.{SparkConf, SparkFunSuite} +import org.apache.spark.deploy.k8s.Config.KUBERNETES_SUBMIT_GRACE_PERIOD +import org.apache.spark.deploy.k8s.Constants.{SPARK_APP_ID_LABEL, SPARK_POD_DRIVER_ROLE, SPARK_ROLE_LABEL} +import org.apache.spark.deploy.k8s.Fabric8Aliases.PODS +import org.apache.spark.scheduler.cluster.k8s.ExecutorLifecycleTestUtils.TEST_SPARK_APP_ID + +class K8sSubmitOpSuite extends SparkFunSuite with BeforeAndAfter { + private val oldErr = System.err + private val driverPodName1 = "driver1" + private val driverPodName2 = "driver2" + private val driverPod1 = buildDriverPod(driverPodName1, "1") + private val driverPod2 = buildDriverPod(driverPodName2, "2") + private val podList = List(driverPod1, driverPod2) + private val namespace = "test" + + @Mock + private var podOperations: PODS = _ + + @Mock + private var driverPodOperations1: PodResource[Pod, DoneablePod] = _ + + @Mock + private var driverPodOperations2: PodResource[Pod, DoneablePod] = _ + + @Mock + private var kubernetesClient: KubernetesClient = _ + + @Mock + private var err: PrintStream = _ + + before { + MockitoAnnotations.initMocks(this) + when(kubernetesClient.pods()).thenReturn(podOperations) + when(podOperations.inNamespace(namespace)).thenReturn(podOperations) + when(podOperations.delete(podList.asJava)).thenReturn(true) + when(podOperations.withName(driverPodName1)).thenReturn(driverPodOperations1) + when(podOperations.withName(driverPodName2)).thenReturn(driverPodOperations2) + when(driverPodOperations1.get).thenReturn(driverPod1) + when(driverPodOperations1.delete()).thenReturn(true) + when(driverPodOperations2.get).thenReturn(driverPod2) + when(driverPodOperations2.delete()).thenReturn(true) + System.setErr(err) + } + + after { + System.setErr(oldErr) Review comment: `listStatus.printStream = err` does not work because It is defined in: ``` trait CommandLineLoggingUtils { // Exposed for testing private[spark] var exitFn: Int => Unit = (exitCode: Int) => System.exit(exitCode) private[spark] var printStream: PrintStream = System.err ... ``` I dont want to mock the ops (which is the subject of testing) which inherit from `K8sSubmitOp` which inherit from `CommandLineLoggingUtils` I would like to test the real op. So I set a mocked stream from which I grab the println calls. `CommandLineLoggingUtils` is used by SparkSubmit so didnt want to touch it (could use a def) and the val there is already set when the trait is mixed in. I dont think it is a mess, it is just local in the tests. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to 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 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
