From 036827cf6dd8dfe31ce3d2269a072dcc072b1941 Mon Sep 17 00:00:00 2001 From: Holden Karau Date: Tue, 27 Aug 2019 11:11:35 -0700 Subject: [PATCH 1/2] Fix deps test to handle minikube v1.3.1 on OSX which returns extra text when printing service URL --- .../deploy/k8s/integrationtest/DepsTestsSuite.scala | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DepsTestsSuite.scala b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DepsTestsSuite.scala index b6f3484a062c..cf07470bd730 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DepsTestsSuite.scala +++ b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DepsTestsSuite.scala @@ -224,9 +224,19 @@ private[spark] trait DepsTestsSuite { k8sSuite: KubernetesSuite => } private def getServiceUrl(serviceName: String): String = { + val fuzzyUrlMatcher = """^(.*?)([a-zA-Z]+://.*?)(\s*)$""".r Eventually.eventually(TIMEOUT, INTERVAL) { // ns is always available either random or provided by the user - Minikube.minikubeServiceAction(serviceName, "-n", kubernetesTestComponents.namespace, "--url") + val rawUrl = Minikube.minikubeServiceAction(serviceName, "-n", kubernetesTestComponents.namespace, "--url") + val url = rawUrl match { + case fuzzyUrlMatcher(junk, url, extra) => + logDebug(s"Service url matched junk ${junk} - url ${url} - extra ${extra}") + url + case _ => + logWarning(s"Response from minikube ${rawUrl} did not match URL regex") + rawUrl + } + url } } } From 3cdea4f9a1c0be5150779d445cf24f806fb4df5e Mon Sep 17 00:00:00 2001 From: Holden Karau Date: Tue, 27 Aug 2019 11:22:59 -0700 Subject: [PATCH 2/2] Long line style fix --- .../spark/deploy/k8s/integrationtest/DepsTestsSuite.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DepsTestsSuite.scala b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DepsTestsSuite.scala index cf07470bd730..7181774b9f17 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DepsTestsSuite.scala +++ b/resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DepsTestsSuite.scala @@ -227,7 +227,8 @@ private[spark] trait DepsTestsSuite { k8sSuite: KubernetesSuite => val fuzzyUrlMatcher = """^(.*?)([a-zA-Z]+://.*?)(\s*)$""".r Eventually.eventually(TIMEOUT, INTERVAL) { // ns is always available either random or provided by the user - val rawUrl = Minikube.minikubeServiceAction(serviceName, "-n", kubernetesTestComponents.namespace, "--url") + val rawUrl = Minikube.minikubeServiceAction( + serviceName, "-n", kubernetesTestComponents.namespace, "--url") val url = rawUrl match { case fuzzyUrlMatcher(junk, url, extra) => logDebug(s"Service url matched junk ${junk} - url ${url} - extra ${extra}")