rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-21 10:29:04 +00:00
Code Issues Releases Wiki Activity

Seperate SSH check from Docker check in tests

Browse Source
This commit is contained in:
Josh Curl 2016-10-19 18:12:47 -07:00
parent 9755a37fe6
commit 19d4be62c6
No known key found for this signature in database
GPG Key ID: 82B504B9BCCFA677
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/common_test.go
View File

@ -84,6 +84,24 @@ func (s *QemuSuite) runQemu(args ...string) error {
func (s *QemuSuite) WaitForSSH() error { func (s *QemuSuite) WaitForSSH() error {
sshArgs := []string{ sshArgs := []string{
"--qemu",
"true",
}
var err error
for i := 0; i < 100; i++ {
cmd := exec.Command(s.sshCommand, sshArgs...)
if err = cmd.Run(); err == nil {
break
}
time.Sleep(500 * time.Millisecond)
}
if err != nil {
return fmt.Errorf("Failed to connect to SSH: %v", err)
}
sshArgs = []string{
"--qemu", "--qemu",
"docker", "docker",
"version", "version",
@ -91,8 +109,7 @@ func (s *QemuSuite) WaitForSSH() error {
"2>&1", "2>&1",
} }
var err error for i := 0; i < 20; i++ {
for i := 0; i < 300; i++ {
cmd := exec.Command(s.sshCommand, sshArgs...) cmd := exec.Command(s.sshCommand, sshArgs...)
if err = cmd.Run(); err == nil { if err = cmd.Run(); err == nil {
return nil return nil
@ -100,7 +117,7 @@ func (s *QemuSuite) WaitForSSH() error {
time.Sleep(500 * time.Millisecond) time.Sleep(500 * time.Millisecond)
} }
return fmt.Errorf("Failed to connect to SSH: %v", err) return fmt.Errorf("Failed to check Docker version: %v", err)
} }
func (s *QemuSuite) MakeCall(additionalArgs ...string) error { func (s *QemuSuite) MakeCall(additionalArgs ...string) error {