rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-14 04:46:18 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Fix ElideCmdline test by making it more robust
This commit is contained in:
Sven Dowideit 2017-06-23 13:04:21 +10:00 committed by GitHub
commit 68b005bc50
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/cmdline_test.go
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,