Merge pull request #9637 from damemi/tty-bug

Merged by openshift-bot

Author: OpenShift Bot

pkg/cmd/cli/cmd/debug.go

@@ -177,6 +177,9 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, args [
 		return kcmdutil.UsageError(cmd, "you may not specify -t and -T together")
 	case o.ForceTTY:
 		o.Attach.TTY = true
+	// since ForceTTY is defaulted to false, check if user specifically passed in "=false" flag
+	case !o.ForceTTY && cmd.Flags().Changed("tty"):
+		o.Attach.TTY = false
 	case o.DisableTTY:
 		o.Attach.TTY = false
 	// don't default TTY to true if a command is passed

test/cmd/debug.sh

@@ -28,6 +28,7 @@ os::cmd::expect_success_and_text "oc debug dc/test-deployment-config --keep-live
 os::cmd::expect_success_and_text "oc debug dc/test-deployment-config -o yaml -- /bin/env" '\- /bin/env'
 os::cmd::expect_success_and_text "oc debug -t dc/test-deployment-config -o yaml" 'stdinOnce'
 os::cmd::expect_success_and_text "oc debug -t dc/test-deployment-config -o yaml" 'tty'
+os::cmd::expect_success_and_not_text "oc debug --tty=false dc/test-deployment-config -o yaml" 'tty'
 os::cmd::expect_success_and_not_text "oc debug dc/test-deployment-config -o yaml -- /bin/env" 'stdin'
 os::cmd::expect_success_and_not_text "oc debug dc/test-deployment-config -o yaml -- /bin/env" 'tty'
 os::cmd::expect_failure_and_text "oc debug dc/test-deployment-config --node-name=invalid -- /bin/env" 'on node "invalid"'
@@ -46,4 +47,4 @@ sha="$( oc get istag/wildfly:latest --template '{{ .image.metadata.name }}' )"
 os::cmd::expect_success_and_text "oc debug isimage/wildfly@${sha} -o yaml" 'image: openshift/wildfly-100-centos7'
 
 echo "debug: ok"
-os::test::junit::declare_suite_end
+os::test::junit::declare_suite_end