From f7d46906763f9d82dddb241a5df18afd60ebccd9 Mon Sep 17 00:00:00 2001 From: Tomas Nozicka Date: Wed, 2 Dec 2020 16:11:35 +0100 Subject: [PATCH 1/2] Tolerate 1.20 error message in test-cmd --- test/extended/testdata/cmd/test/cmd/quota.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extended/testdata/cmd/test/cmd/quota.sh b/test/extended/testdata/cmd/test/cmd/quota.sh index 05bc82f4ce5e..3f4667c3834e 100755 --- a/test/extended/testdata/cmd/test/cmd/quota.sh +++ b/test/extended/testdata/cmd/test/cmd/quota.sh @@ -26,7 +26,7 @@ os::cmd::expect_success 'oc create clusterquota for-deads --project-label-select os::cmd::try_until_text 'oc get appliedclusterresourcequota -n quota-foo --as deads -o name' "for-deads" os::cmd::try_until_text 'oc get secrets --all-namespaces; oc get appliedclusterresourcequota/for-deads -n quota-foo --as deads -o jsonpath=used={.status.total.used.secrets}' "used=9" -os::cmd::expect_failure_and_text 'oc create clusterquota for-deads-malformed --project-annotation-selector="openshift.#$%/requester=deads"' "prefix part a DNS-1123 subdomain must consist of lower case alphanumeric characters" +os::cmd::expect_failure_and_text 'oc create clusterquota for-deads-malformed --project-annotation-selector="openshift.#$%/requester=deads"' "prefix part a (DNS-1123|lowercase RFC 1123) subdomain must consist of lower case alphanumeric characters" os::cmd::expect_failure_and_text 'oc create clusterquota for-deads-malformed --project-annotation-selector=openshift.io/requester=deads,openshift.io/novalue' "Malformed annotation selector" os::cmd::expect_success 'oc create clusterquota for-deads-by-annotation --project-annotation-selector=openshift.io/requester=deads --hard=secrets=50' os::cmd::expect_success 'oc create clusterquota for-deads-email-by-annotation --project-annotation-selector=openshift.io/requester=deads@deads.io --hard=secrets=50' From f7ce6529da3724c9c25a14f94f2455300002a60b Mon Sep 17 00:00:00 2001 From: Tomas Nozicka Date: Wed, 2 Dec 2020 16:12:33 +0100 Subject: [PATCH 2/2] Update generated --- test/extended/testdata/bindata.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 4b4880762c87..7ea1979be43d 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -33740,7 +33740,7 @@ os::cmd::expect_success 'oc create clusterquota for-deads --project-label-select os::cmd::try_until_text 'oc get appliedclusterresourcequota -n quota-foo --as deads -o name' "for-deads" os::cmd::try_until_text 'oc get secrets --all-namespaces; oc get appliedclusterresourcequota/for-deads -n quota-foo --as deads -o jsonpath=used={.status.total.used.secrets}' "used=9" -os::cmd::expect_failure_and_text 'oc create clusterquota for-deads-malformed --project-annotation-selector="openshift.#$%/requester=deads"' "prefix part a DNS-1123 subdomain must consist of lower case alphanumeric characters" +os::cmd::expect_failure_and_text 'oc create clusterquota for-deads-malformed --project-annotation-selector="openshift.#$%/requester=deads"' "prefix part a (DNS-1123|lowercase RFC 1123) subdomain must consist of lower case alphanumeric characters" os::cmd::expect_failure_and_text 'oc create clusterquota for-deads-malformed --project-annotation-selector=openshift.io/requester=deads,openshift.io/novalue' "Malformed annotation selector" os::cmd::expect_success 'oc create clusterquota for-deads-by-annotation --project-annotation-selector=openshift.io/requester=deads --hard=secrets=50' os::cmd::expect_success 'oc create clusterquota for-deads-email-by-annotation --project-annotation-selector=openshift.io/requester=deads@deads.io --hard=secrets=50'