Merge pull request #1938 from SvenDowideit/fix-elide-cmdline-test

Fix ElideCmdline test by making it more robust

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,