diff --git a/tests/cmdline_test.go b/tests/cmdline_test.go index fd007c24..04c9c1ff 100755 --- a/tests/cmdline_test.go +++ b/tests/cmdline_test.go @@ -1,7 +1,11 @@ package integration -import . "gopkg.in/check.v1" -import "fmt" +import ( + . "gopkg.in/check.v1" + + "fmt" + "strings" +) func (s *QemuSuite) TestElideCmdLine(c *C) { extra := "cc.hostname=nope rancher.password=three" @@ -15,11 +19,10 @@ func (s *QemuSuite) TestElideCmdLine(c *C) { s.RunQemuWith(c, runArgs...) s.CheckOutput(c, "nope\n", Equals, "hostname") - s.CheckOutput(c, - "printk.devkmsg=on rancher.debug=true rancher.password=rancher console=ttyS0 rancher.autologin=ttyS0 cc.something=yes rancher.password=two rancher.state.dev=LABEL=RANCHER_STATE rancher.state.autoformat=[/dev/sda,/dev/vda] rancher.rm_usr -- \n", - Equals, - "cat /proc/cmdline", - ) + cmdline := s.CheckOutput(c, "", Not(Equals), "cat /proc/cmdline") + if strings.Contains(cmdline, extra) { + c.Errorf("/proc/cmdline (%s) contains info that should be elided (%s)", cmdline, extra) + } s.CheckOutput(c, fmt.Sprintf("/init %s\n", extra), Equals, diff --git a/tests/installer_test.go b/tests/installer_test.go index cd76edd7..cbe01719 100755 --- a/tests/installer_test.go +++ b/tests/installer_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "strings" "time" . "gopkg.in/check.v1" @@ -119,47 +118,6 @@ sync s.Stop(c) } -func (s *QemuSuite) TestAutoResize(c *C) { - runArgs := []string{ - "--iso", - "--fresh", - } - version := "" - disk := "/dev/vda1\n" - size := "" - { - s.RunQemuWith(c, runArgs...) - - version = s.CheckOutput(c, version, Not(Equals), "sudo ros -v") - fmt.Printf("installing %s", version) - - s.CheckCall(c, ` -set -ex -echo "ssh_authorized_keys:" > config.yml -echo " - $(cat /home/rancher/.ssh/authorized_keys)" >> config.yml -sudo ros install --force --no-reboot --device /dev/vda -c config.yml --append "rancher.resize_device=/dev/vda" -sync -`) - time.Sleep(500 * time.Millisecond) - s.CheckCall(c, "sudo mount "+strings.TrimSpace(disk)+" /mnt") - size = s.CheckOutput(c, size, Not(Equals), "df -h | grep "+strings.TrimSpace(disk)+" | head -n1 | sed 's/ \\+/;/g' | cut -d ';' -f 2") - s.Stop(c) - } - - // ./scripts/run --no-format --append "rancher.debug=true" - runArgs = []string{ - "--boothd", - "--resizehd", "+20G", - } - s.RunQemuWith(c, runArgs...) - - s.CheckOutput(c, version, Equals, "sudo ros -v") - s.CheckOutput(c, disk, Equals, "blkid | cut -f 1 -d ' ' | sed 's/://'") - s.CheckOutput(c, size, Not(Equals), "df -h | grep "+strings.TrimSpace(disk)+" | head -n1 | sed 's/ \\+/;/g' | cut -d ';' -f 2") - - s.Stop(c) -} - func (s *QemuSuite) KillsMyServerTestInstalledDhcp(c *C) { // ./scripts/run --no-format --append "rancher.debug=true" --iso --fresh runArgs := []string{