modify salt_test not to check hostname -f at hostname manipulation

Tamas Bihari · Tamas Bihari · commit 931ccea9f1e2 · 2016-12-21T19:15:36.000+01:00
diff --git a/saltboot/salt_test.go b/saltboot/salt_test.go
@@ -105,7 +105,7 @@ func TestSaltMinionRunRequestHandler(t *testing.T) {
 		t.Errorf("couldn't unmarshall grain yaml: %s", err)
 	}
 
-	if os.Getenv(EXECUTED_COMMANDS) != "hostname -f:hostname -i:ps aux:/sbin/service salt-minion start:/sbin/chkconfig salt-minion on:" {
+	if os.Getenv(EXECUTED_COMMANDS) != "hostname -s:hostname -d:hostname -i:ps aux:/sbin/service salt-minion start:/sbin/chkconfig salt-minion on:" {
 		t.Errorf("wrong commands were executed: %s", os.Getenv(EXECUTED_COMMANDS))
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ func TestSaltMinionRunRequestHandler(t *testing.T) {`
`105`	`105`	`t.Errorf("couldn't unmarshall grain yaml: %s", err)`
`106`	`106`	`}`
`107`	`107`
`108`		`- if os.Getenv(EXECUTED_COMMANDS) != "hostname -f:hostname -i:ps aux:/sbin/service salt-minion start:/sbin/chkconfig salt-minion on:" {`
	`108`	`+ if os.Getenv(EXECUTED_COMMANDS) != "hostname -s:hostname -d:hostname -i:ps aux:/sbin/service salt-minion start:/sbin/chkconfig salt-minion on:" {`
`109`	`109`	`t.Errorf("wrong commands were executed: %s", os.Getenv(EXECUTED_COMMANDS))`
`110`	`110`	`}`
`111`	`111`	`}`