rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-10 11:03:16 +00:00
Code Issues Releases Wiki Activity

Fix ros dev panic

Browse Source
This commit is contained in:
Darren Shepherd 2016-02-04 09:25:36 -07:00
parent ce915927be
commit 28bd8b0ccb
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/control/dev.go
View File

@ -2,10 +2,13 @@ package control
import ( import (
"fmt" "fmt"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/rancher/os/util" "github.com/rancher/os/util"
) )
func devAction(c *cli.Context) { func devAction(c *cli.Context) {
fmt.Println(util.ResolveDevice(c.Args()[0])) if len(c.Args()) > 0 {
fmt.Println(util.ResolveDevice(c.Args()[0]))
}
} }

15
tests/integration/rostest/test_00_system.py
View File

@ -31,3 +31,18 @@ def test_run_system_container(qemu):
ssh.wait() ssh.wait()
assert ssh.returncode == 0 assert ssh.returncode == 0
@pytest.mark.timeout(60)
def test_ros_dev(qemu):
u.wait_for_ssh(qemu)
ssh = subprocess.Popen(
'./scripts/ssh --qemu sudo ros dev',
shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
for ln in u.iter_lines(ssh.stdout):
print(ln)
ssh.wait()
assert ssh.returncode == 0