Commita73476d

committed

Get tests passing using pipePty implementation

1 parentc949d44 commita73476dCopy full SHA for a73476d

File tree

+241

-207

lines changed

+241

-207

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,10 @@ func login() *cobra.Command {`
`44`	`44`	`returnxerrors.Errorf("has initial user: %w",err)`
`45`	`45`	`}`
`46`	`46`	`if!hasInitialUser {`
`47`		`-if!isTTY(cmd.InOrStdin()) {`
`48`		`-returnxerrors.New("the initial user cannot be created in non-interactive mode. use the API")`
`49`		`-}`
	`47`	`+// TODO: Bryan - is this check correct on windows?`
	`48`	`+// if !isTTY(cmd.InOrStdin()) {`
	`49`	`+// return xerrors.New("the initial user cannot be created in non-interactive mode. use the API")`
	`50`	`+// }`
`50`	`51`	`_,_=fmt.Fprintf(cmd.OutOrStdout(),"%s Your Coder deployment hasn't been set up!\n",color.HiBlackString(">"))`
`51`	`52`
`52`	`53`	`_,err:=runPrompt(cmd,&promptui.Prompt{`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ package conpty`
`8`	`8`
`9`	`9`	`import (`
`10`	`10`	`"fmt"`
	`11`	`+"io"`
`11`	`12`	`"os"`
`12`	`13`
`13`	`14`	`"golang.org/x/sys/windows"`
`@@ -42,14 +43,22 @@ func (c *ConPty) Close() error {`
`42`	`43`
`43`	`44`	`// OutPipe returns the output pipe of the pseudo terminal`
`44`	`45`	`func (cConPty)OutPipe()os.File {`
	`46`	`+returnc.inPipe`
	`47`	`+}`
	`48`	`+`
	`49`	`+func (c*ConPty)Reader() io.Reader {`
`45`	`50`	`returnc.outPipe`
`46`	`51`	`}`
`47`	`52`
`48`	`53`	`// InPipe returns input pipe of the pseudo terminal`
`49`	`54`	`// Note: It is safer to use the Write method to prevent partially-written VT sequences`
`50`	`55`	`// from corrupting the terminal`
`51`	`56`	`func (cConPty)InPipe()os.File {`
`52`		`-returnc.inPipe`
	`57`	`+returnc.outPipe`
	`58`	`+}`
	`59`	`+`
	`60`	`+func (c*ConPty)WriteString(strstring) (int,error) {`
	`61`	`+returnc.inPipe.WriteString(str)`
`53`	`62`	`}`
`54`	`63`
`55`	`64`	`func (c*ConPty)createPseudoConsoleAndPipes()error {`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,9 @@ func (c *Console) Send(s string) (int, error) {`
`217`	`217`
`218`	`218`	`// SendLine writes string s to Console's tty with a trailing newline.`
`219`	`219`	`func (c*Console)SendLine(sstring) (int,error) {`
`220`		`-returnc.Send(fmt.Sprintf("%s\n",s))`
	`220`	`+bytes,err:=c.Send(fmt.Sprintf("%s\r\n",s))`
	`221`	`+`
	`222`	`+returnbytes,err`
`221`	`223`	`}`
`222`	`224`
`223`	`225`	`// Log prints to Console's logger.`

Comments

(0)