Skip to content

Commit 1605423

Browse files
author
OpenShift Bot
authored
Merge pull request #10317 from juanvallejo/jvallejo_remove-duplicate-err-oclabel-ocenv
Merged by openshift-bot
2 parents d5ee105 + 29e7025 commit 1605423

File tree

3 files changed

+51
-15
lines changed

3 files changed

+51
-15
lines changed

test/cmd/newapp.sh

+5
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ os::cmd::expect_success 'oc delete all -l app=php'
4848
os::cmd::expect_failure 'oc get dc/mysql'
4949
os::cmd::expect_failure 'oc get dc/php'
5050

51+
# ensure non-duplicate invalid label errors show up
52+
os::cmd::expect_failure_and_text 'oc new-app nginx -l qwer1345%$$#=self' 'error: ImageStream "nginx" is invalid'
53+
os::cmd::expect_failure_and_text 'oc new-app nginx -l qwer1345%$$#=self' 'DeploymentConfig "nginx" is invalid'
54+
os::cmd::expect_failure_and_text 'oc new-app nginx -l qwer1345%$$#=self' 'Service "nginx" is invalid'
55+
5156
# check if we can create from a stored template
5257
os::cmd::expect_success 'oc create -f examples/sample-app/application-template-stibuild.json'
5358
os::cmd::expect_success 'oc get template ruby-helloworld-sample'

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util/helpers.go

+23-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util/helpers_test.go

+23-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)