Commit 090e71e7 authored by Icarus Sparry's avatar Icarus Sparry Committed by Russ Cox

os: in test, allow Hostname to return FQDN even if /bin/hostname does not

Hostname reads the file /proc/sys/kernel/hostname to determine
the value it returns. Some people set this to a Fully Qualified
Doamin Name. At least one implementation of /bin/hostname
truncates the name it gets (often from the "uname" system call)
at the first dot unless it is given a "-f" flag. This change makes
the unit test also truncate at the first dot and checks if the strings
then match. This seems more portable than adding an extra flag
to the called /bin/hostname program.

R=rsc
CC=golang-dev
https://golang.org/cl/181097
parent 7c1841fb
......@@ -647,14 +647,19 @@ func run(t *testing.T, cmd []string) string {
func TestHostname(t *testing.T) {
// Check internal Hostname() against the output of /bin/hostname.
// Allow that the internal Hostname returns a Fully Qualified Domain Name
// and the /bin/hostname only returns the first component
hostname, err := Hostname()
if err != nil {
t.Fatalf("%v", err)
}
want := run(t, []string{"/bin/hostname"})
if hostname != want {
i := strings.Index(hostname, ".")
if i < 0 || hostname[0:i] != want {
t.Errorf("Hostname() = %q, want %q", hostname, want)
}
}
}
func TestReadAt(t *testing.T) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment