From f5dc5300c6a51d8c3c8f6df796786716e426e374 Mon Sep 17 00:00:00 2001 From: Brian Pursley Date: Tue, 9 Jun 2020 08:35:54 -0400 Subject: [PATCH] Replaced 4 kube::test::get_object_assert() calls with 1 call using regex to match all combinations --- test/cmd/discovery.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/cmd/discovery.sh b/test/cmd/discovery.sh index 258b03d6ebb..3e909f2b9e3 100755 --- a/test/cmd/discovery.sh +++ b/test/cmd/discovery.sh @@ -86,12 +86,9 @@ run_resource_aliasing_tests() { request="{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}" # all 4 cassandra's might not be in the request immediately... - # first option with :: suffix is for possible service.kubernetes.io/headless + # :? suffix is for possible service.kubernetes.io/headless # label with "" value - kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:cassandra:cassandra::' || \ - kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:cassandra:cassandra:' || \ - kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:cassandra:' || \ - kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:' + kube::test::get_object_assert "$object" "$request" '(cassandra:){2}(cassandra:(cassandra::?)?)?' kubectl delete all -l app=cassandra "${kube_flags[@]}"