Merge pull request #1700 from endocode/dongsu/systemd-errmsg-fxtests

functional: fix error from message change from systemctl status

Author: Dongsu Park

functional/node_test.go

@@ -77,9 +77,14 @@ func TestNodeShutdown(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// The member's unit should actually stop running, too
-	stdout, _ = cluster.MemberCommand(m0, "systemctl", "status", "hello.service")
-	if !strings.Contains(stdout, "Active: inactive") {
+	// The member's unit should actually stop running, too.
+	// NOTE: In case of no units, systemd v230 or older prints out
+	// "Active: inactive" to stdout, while systemd v231 or newer prints out
+	// "Unit NAME could not be found" to stderr. So we need to check for
+	// both cases. Use MemberCommandStderr() to retrieve both stdout and stderr,
+	// and check for each case.
+	stdout, stderr, err = cluster.MemberCommandStderr(m0, "systemctl", "status", "hello.service")
+	if !strings.Contains(stdout, "Active: inactive") && !strings.Contains(stderr, "could not be found") {
 		t.Fatalf("Unit hello.service not reported as inactive:\n%s\n", stdout)
 	}
 }

functional/platform/cluster.go

@@ -32,6 +32,7 @@ type Cluster interface {
 	ReplaceMember(Member) (Member, error)
 	Members() []Member
 	MemberCommand(Member, ...string) (string, error)
+	MemberCommandStderr(Member, ...string) (string, string, error)
 	Destroy(t *testing.T) error
 
 	// client operations

functional/platform/nspawn.go

@@ -390,6 +390,28 @@ func (nc *nspawnCluster) MemberCommand(m Member, args ...string) (string, error)
 	return stdoutBytes.String(), err
 }
 
+// MemberCommandStderr() is like MemberCommand(), except that it returns
+// both stdout and stderr from the running command. This is definitely useful
+// for most cases, especially when the caller needs to check for both stdout
+// and stderr.
+//
+// NOTE: Ideally we should remove MemberCommand() above, and rename
+// MemberCommandStderr() to MemberCommand(). For doing that, however, we need
+// to change every call site to replace MemberCommand() with MemberCommandStderr().
+// Of course that would be a lot of work. I'll leave that to future work.
+// - dpark 20161102
+func (nc *nspawnCluster) MemberCommandStderr(m Member, args ...string) (string, string, error) {
+	baseArgs := []string{"-o", "UserKnownHostsFile=/dev/null", "-o", "StrictHostKeyChecking=no", fmt.Sprintf("core@%s", m.IP())}
+	args = append(baseArgs, args...)
+	log.Printf("ssh %s", strings.Join(args, " "))
+	var stdoutBytes, stderrBytes bytes.Buffer
+	cmd := exec.Command("ssh", args...)
+	cmd.Stdout = &stdoutBytes
+	cmd.Stderr = &stderrBytes
+	err := cmd.Run()
+	return stdoutBytes.String(), stderrBytes.String(), err
+}
+
 func (nc *nspawnCluster) CreateMember() (m Member, err error) {
 	id := nc.nextID()
 	log.Printf("Creating nspawn machine %s in cluster %s", id, nc.name)