Commit76d3a24

committed

implement unit test to verify jetbrains functionality

1 parent2447970 commit76d3a24Copy full SHA for 76d3a24

File tree

+39

-5

lines changed

+39

-5

lines changed

Lines changed: 33 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -206,12 +206,41 @@ func TestAgent_Stats_Magic(t *testing.T) {`
`206`	`206`	`remotePort:=tcpAddr.Port`
`207`	`207`	`goechoOnce(t,rl)`
`208`	`208`
`209`		`-sshClient:=setupAgentSSHClient(ctx,t)`
	`209`	`+//nolint:dogsled`
	`210`	`+conn,_,stats,_,_:=setupAgent(t, agentsdk.Manifest{},0)`
	`211`	`+sshClient,err:=conn.SSHClient(ctx)`
	`212`	`+require.NoError(t,err)`
`210`	`213`
`211`		`-conn,err:=sshClient.Dial("tcp",fmt.Sprintf("127.0.0.1:%d",remotePort))`
	`214`	`+tunneledConn,err:=sshClient.Dial("tcp",fmt.Sprintf("127.0.0.1:%d",remotePort))`
`212`	`215`	`require.NoError(t,err)`
`213`		`-deferconn.Close()`
`214`		`-requireEcho(t,conn)`
	`216`	`+t.Cleanup(func() {`
	`217`	`+// always close on failure of test`
	`218`	`+_=conn.Close()`
	`219`	`+_=tunneledConn.Close()`
	`220`	`+})`
	`221`	`+`
	`222`	`+vars*agentsdk.Stats`
	`223`	`+require.Eventuallyf(t,func()bool {`
	`224`	`+varokbool`
	`225`	`+s,ok=<-stats`
	`226`	`+returnok&&s.ConnectionCount>0&&`
	`227`	`+s.SessionCountJetBrains==1`
	`228`	`+},testutil.WaitLong,testutil.IntervalFast,`
	`229`	`+"never saw stats with conn open: %+v",s,`
	`230`	`+)`
	`231`	`+`
	`232`	`+// Manually closing the connection`
	`233`	`+requireEcho(t,tunneledConn)`
	`234`	`+_=rl.Close()`
	`235`	`+`
	`236`	`+require.Eventuallyf(t,func()bool {`
	`237`	`+varokbool`
	`238`	`+s,ok=<-stats`
	`239`	`+returnok&&s.ConnectionCount==0&&`
	`240`	`+s.SessionCountJetBrains==0`
	`241`	`+},testutil.WaitLong,testutil.IntervalFast,`
	`242`	`+"never saw stats after conn closes: %+v",s,`
	`243`	`+)`
`215`	`244`	`})`
`216`	`245`	`}`
`217`	`246`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package agentssh`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+"sync"`
	`5`	`+`
`4`	`6`	`"cdr.dev/slog"`
`5`	`7`	`"go.uber.org/atomic"`
`6`	`8`	`gossh"golang.org/x/crypto/ssh"`
`@@ -54,10 +56,13 @@ func (w ChannelAcceptWatcher) Accept() (gossh.Channel, <-chan gossh.Request, e`
`54`	`56`
`55`	`57`	`typeChannelOnClosestruct {`
`56`	`58`	`gossh.Channel`
	`59`	`+// once ensures close only decrements the counter once.`
	`60`	`+// Because close can be called multiple times.`
	`61`	`+once sync.Once`
`57`	`62`	`donefunc()`
`58`	`63`	`}`
`59`	`64`
`60`	`65`	`func (c*ChannelOnClose)Close()error {`
`61`		`-c.done()`
	`66`	`+c.once.Do(c.done)`
`62`	`67`	`returnc.Channel.Close()`
`63`	`68`	`}`

Comments

(0)