1
0
mirror of https://github.com/rancher/os.git synced 2025-07-19 17:39:04 +00:00

Fix ElideCmdline test by making it more robust

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-06-22 12:44:18 +10:00
parent 779e3f8d9d
commit e19ccefff8

View File

@ -1,7 +1,11 @@
package integration package integration
import . "gopkg.in/check.v1" import (
import "fmt" . "gopkg.in/check.v1"
"fmt"
"strings"
)
func (s *QemuSuite) TestElideCmdLine(c *C) { func (s *QemuSuite) TestElideCmdLine(c *C) {
extra := "cc.hostname=nope rancher.password=three" extra := "cc.hostname=nope rancher.password=three"
@ -15,11 +19,10 @@ func (s *QemuSuite) TestElideCmdLine(c *C) {
s.RunQemuWith(c, runArgs...) s.RunQemuWith(c, runArgs...)
s.CheckOutput(c, "nope\n", Equals, "hostname") s.CheckOutput(c, "nope\n", Equals, "hostname")
s.CheckOutput(c, cmdline := s.CheckOutput(c, "", Not(Equals), "cat /proc/cmdline",)
"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", if strings.Contains(cmdline, extra) {
Equals, c.Errorf("/proc/cmdline (%s) contains info that should be elided (%s)", cmdline, extra)
"cat /proc/cmdline", }
)
s.CheckOutput(c, s.CheckOutput(c,
fmt.Sprintf("/init %s\n", extra), fmt.Sprintf("/init %s\n", extra),
Equals, Equals,