public_git
/
orchard
mirror of https://github.com/cirruslabs/orchard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-try SSH connections in integration tests 

Because a VM might be still booting.
This commit is contained in:
Nikolay Edigaryev 2026-03-07 00:09:52 +01:00
parent d96249cfbb
commit fb72c3bee9
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
internal/tests/ip_endpoint_test.go
View File

@ -7,6 +7,7 @@ import (
"testing"
"time"
"github.com/avast/retry-go/v5"
"github.com/cirruslabs/orchard/internal/tests/devcontroller"
"github.com/cirruslabs/orchard/internal/tests/platformdependent"
"github.com/cirruslabs/orchard/internal/tests/wait"
@ -38,19 +39,28 @@ func TestIPEndpoint(t *testing.T) {
require.NoError(t, err)
// Connect to the VM over SSH to make sure the provided IP is valid
sshClient, err := ssh.Dial("tcp", ip+":22", &ssh.ClientConfig{
User: "admin",
Auth: []ssh.AuthMethod{
ssh.Password("admin"),
},
HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
return nil
},
sshClient, err := retry.NewWithData[*ssh.Client](
retry.Context(t.Context()),
retry.DelayType(retry.FixedDelay),
retry.Delay(time.Second),
retry.Attempts(0),
).Do(func() (*ssh.Client, error) {
return ssh.Dial("tcp", ip+":22", &ssh.ClientConfig{
User: "admin",
Auth: []ssh.AuthMethod{
ssh.Password("admin"),
},
HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
return nil
},
})
})
require.NoError(t, err)
defer sshClient.Close()
sshSession, err := sshClient.NewSession()
require.NoError(t, err)
defer sshSession.Close()
output, err := sshSession.CombinedOutput("uname -a")
require.NoError(t, err)

13
internal/tests/sshserver_test.go
View File

@ -9,6 +9,7 @@ import (
"testing"
"time"
"github.com/avast/retry-go/v5"
"github.com/cirruslabs/orchard/internal/controller"
"github.com/cirruslabs/orchard/internal/tests/devcontroller"
"github.com/cirruslabs/orchard/internal/tests/platformdependent"
@ -82,8 +83,16 @@ func TestSSHServer(t *testing.T) {
},
})
require.NoError(t, err)
defer sshClientController.Close()
netConnVM, err := sshClientController.Dial("tcp", "test-vm:22")
netConnVM, err := retry.NewWithData[net.Conn](
retry.Context(t.Context()),
retry.DelayType(retry.FixedDelay),
retry.Delay(time.Second),
retry.Attempts(0),
).Do(func() (net.Conn, error) {
return sshClientController.Dial("tcp", "test-vm:22")
})
require.NoError(t, err)
sshConnVM, sshChansVM, sshReqsVM, err := ssh.NewClientConn(netConnVM, "test-vm:22", &ssh.ClientConfig{
@ -98,9 +107,11 @@ func TestSSHServer(t *testing.T) {
require.NoError(t, err)
sshClientVM := ssh.NewClient(sshConnVM, sshChansVM, sshReqsVM)
defer sshClientVM.Close()
sshSessVM, err := sshClientVM.NewSession()
require.NoError(t, err)
defer sshSessVM.Close()
unameBytes, err := sshSessVM.Output("uname -a")
require.NoError(t, err)