From b5e5e93201ccbc1b4ed1da0378c1f550508bfc4f Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 5 Jun 2017 11:34:01 -0400 Subject: [PATCH] Avoid * in filenames --- .../src/k8s.io/apiserver/pkg/server/options/serving_test.go | 3 ++- .../{test.com_*.test.com_ => test.com_star.test.com_}/cert | 0 .../{test.com_*.test.com_ => test.com_star.test.com_}/key | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/{test.com_*.test.com_ => test.com_star.test.com_}/cert (100%) rename staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/{test.com_*.test.com_ => test.com_star.test.com_}/key (100%) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go b/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go index d26d256b778..c70a2ccb4e6 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go @@ -395,7 +395,8 @@ func TestServerRunWithSNI(t *testing.T) { } specToName := func(spec TestCertSpec) string { - return spec.host + "_" + strings.Join(spec.names, ",") + "_" + strings.Join(spec.ips, ",") + name := spec.host + "_" + strings.Join(spec.names, ",") + "_" + strings.Join(spec.ips, ",") + return strings.Replace(name, "*", "star", -1) } NextTest: diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/test.com_*.test.com_/cert b/staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/test.com_star.test.com_/cert similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/test.com_*.test.com_/cert rename to staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/test.com_star.test.com_/cert diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/test.com_*.test.com_/key b/staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/test.com_star.test.com_/key similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/test.com_*.test.com_/key rename to staging/src/k8s.io/apiserver/pkg/server/options/testdata/localhost__127.0.0.1/test.com_star.test.com_/key