Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request #1626 from endocode/dongsu/error-with-stderr-fxtests
Browse files Browse the repository at this point in the history 
functional: retrieve stdout/stderr after running command
  • Loading branch information
Dongsu Park authored Jul 8, 2016
2 parents 0953a0d + 8c7d302 commit 40a90d0
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 87 deletions.
4 changes: 2 additions & 2 deletions functional/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ func TestKnownHostsVerification(t *testing.T) {
}

// SSH'ing to the cluster member should now fail with a host key mismatch
if _, _, err := cluster.Fleetctl(m0, "--strict-host-key-checking=true", fmt.Sprintf("--known-hosts-file=%s", khFile), "ssh", m1.ID(), "uptime"); err == nil {
t.Errorf("Expected error while SSH'ing to fleet machine")
if stdout, stderr, err := cluster.Fleetctl(m0, "--strict-host-key-checking=true", fmt.Sprintf("--known-hosts-file=%s", khFile), "ssh", m1.ID(), "uptime"); err == nil {
t.Errorf("Expected error while SSH'ing to fleet machine\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}

// Overwrite the known-hosts file to simulate removing the old host key
Expand Down
18 changes: 10 additions & 8 deletions functional/cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ func TestDynamicClusterNewMemberUnitMigration(t *testing.T) {

// All 3 services should be visible immediately, and all of them should
// become ACTIVE shortly thereafter
stdout, _, err = cluster.Fleetctl(m0, "list-units", "--no-legend")
stdout, stderr, err = cluster.Fleetctl(m0, "list-units", "--no-legend")
if err != nil {
t.Fatalf("Failed to run list-units: %v", err)
t.Fatalf("Failed to run list-units:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
units := strings.Split(strings.TrimSpace(stdout), "\n")
if len(units) != 3 {
Expand All @@ -75,8 +75,10 @@ func TestDynamicClusterNewMemberUnitMigration(t *testing.T) {
// Kill one of the machines and make sure the unit migrates somewhere else
unit := "conflict.1.service"
oldMach := states[unit].Machine
if _, _, err = cluster.Fleetctl(m0, "--strict-host-key-checking=false", "ssh", oldMach, "sudo", "systemctl", "stop", "fleet"); err != nil {
t.Fatal(err)
stdout, stderr, err = cluster.Fleetctl(m0, "--strict-host-key-checking=false", "ssh", oldMach,
"sudo", "systemctl", "stop", "fleet")
if err != nil {
t.Fatalf("Failed to stop fleet service:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
var mN platform.Member
if m0.ID() == oldMach {
Expand Down Expand Up @@ -131,20 +133,20 @@ func TestDynamicClusterMemberReboot(t *testing.T) {
t.Fatal(err)
}

_, _, err = cluster.Fleetctl(m0, "start",
stdout, stderr, err := cluster.Fleetctl(m0, "start",
"fixtures/units/conflict.0.service",
"fixtures/units/conflict.1.service",
"fixtures/units/conflict.2.service",
)
if err != nil {
t.Errorf("Failed starting units: %v", err)
t.Errorf("Failed starting units:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}

// All 3 services should be visible immediately, and all of them should
// become ACTIVE shortly thereafter
stdout, _, err := cluster.Fleetctl(m0, "list-units", "--no-legend")
stdout, stderr, err = cluster.Fleetctl(m0, "list-units", "--no-legend")
if err != nil {
t.Fatalf("Failed to run list-units: %v", err)
t.Fatalf("Failed to run list-units:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
units := strings.Split(strings.TrimSpace(stdout), "\n")
if len(units) != 3 {
Expand Down
8 changes: 4 additions & 4 deletions functional/connectivity-loss_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ func TestSingleNodeConnectivityLoss(t *testing.T) {
checkExpectedStates := func() (isExpected bool, expected, actual map[string]string) {
// First check unit files.
// These shouldn't change at all after intital submit -- but better safe than sorry...
stdout, _, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend", "--full", "--fields", "unit,dstate")
stdout, stderr, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend", "--full", "--fields", "unit,dstate")
if err != nil {
t.Errorf("Failed listing unit files: %v", err)
t.Errorf("Failed listing unit files:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
stdout = strings.TrimSpace(stdout)

Expand All @@ -113,9 +113,9 @@ func TestSingleNodeConnectivityLoss(t *testing.T) {
}

// Now check the actual unit states.
stdout, _, err = cluster.Fleetctl(m0, "list-units", "--no-legend", "--full", "--fields", "unit,active")
stdout, stderr, err = cluster.Fleetctl(m0, "list-units", "--no-legend", "--full", "--fields", "unit,active")
if err != nil {
t.Errorf("Failed listing units: %v", err)
t.Errorf("Failed listing units:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
stdout = strings.TrimSpace(stdout)

Expand Down
10 changes: 6 additions & 4 deletions functional/fleetctl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ import (
)

func TestClientVersionFlag(t *testing.T) {
stdout, _, err := util.RunFleetctl("version")
stdout, stderr, err := util.RunFleetctl("version")
if err != nil {
t.Fatalf("Unexpected error while executing fleetctl: %v", err)
t.Fatalf("Unexpected error while executing fleetctl:\nstdout: %s\nstderr: %s\nerr: %v",
stdout, stderr, err)
}

if strings.TrimSpace(stdout) != fmt.Sprintf("fleetctl version %s", version.Version) {
Expand All @@ -35,9 +36,10 @@ func TestClientVersionFlag(t *testing.T) {
}

func TestClientVersionHelpOutput(t *testing.T) {
stdout, _, err := util.RunFleetctl("help")
stdout, stderr, err := util.RunFleetctl("help")
if err != nil {
t.Fatalf("Unexpected error while executing fleetctl: %v", err)
t.Fatalf("Unexpected error while executing fleetctl:\nstdout: %s\nstderr: %s\nerr: %v",
stdout, stderr, err)
}

if !strings.Contains(stdout, fmt.Sprintf("%s", version.Version)) {
Expand Down
16 changes: 8 additions & 8 deletions functional/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ func TestNodeShutdown(t *testing.T) {
}

// Stop the fleet process on the first member
if _, err = cluster.MemberCommand(m0, "sudo", "systemctl", "stop", "fleet"); err != nil {
t.Fatal(err)
if stdout, err = cluster.MemberCommand(m0, "sudo", "systemctl", "stop", "fleet"); err != nil {
t.Fatalf("Failed stopping fleet service: %v\nstdout: %s\n", err, stdout)
}

// The first member should quickly remove itself from the published
Expand Down Expand Up @@ -118,13 +118,13 @@ func TestDetectMachineId(t *testing.T) {
return fmt.Errorf("Failed to restart fleet service\nstdout: %s\nerr: %v", stdout, err)
}

stdout, _ = cluster.MemberCommand(m, "systemctl", "show", "--property=ActiveState", "fleet")
stdout, err = cluster.MemberCommand(m, "systemctl", "show", "--property=ActiveState", "fleet")
if strings.TrimSpace(stdout) != "ActiveState=active" {
return fmt.Errorf("Fleet unit not reported as active: %s", stdout)
return fmt.Errorf("Fleet unit not reported as active:\nstdout:%s\nerr: %v", stdout, err)
}
stdout, _ = cluster.MemberCommand(m, "systemctl", "show", "--property=Result", "fleet")
stdout, err = cluster.MemberCommand(m, "systemctl", "show", "--property=Result", "fleet")
if strings.TrimSpace(stdout) != "Result=success" {
return fmt.Errorf("Result for fleet unit not reported as success: %s", stdout)
return fmt.Errorf("Result for fleet unit not reported as success:\nstdout:%s\nerr: %v", stdout, err)
}
return nil
}
Expand Down Expand Up @@ -155,12 +155,12 @@ func TestDetectMachineId(t *testing.T) {
if err != nil {
if !strings.Contains(err.Error(), "exit status 1") ||
!strings.Contains(stderr, "fleet server unable to communicate with etcd") {
t.Fatalf("m1: Failed to get list of machines. err: %v\nstderr: %s", err, stderr)
t.Fatalf("m1: Failed to get list of machines. err: %v\nstdout: %s\nstderr: %s", err, stdout, stderr)
}
// If both conditions are satisfied, "exit status 1" and
// "...unable to communicate...", then it's an expected error. PASS.
} else {
t.Fatalf("m1: should get an error, but got success.\nstderr: %s", stderr)
t.Fatalf("m1: should get an error, but got success.\nstdout: %s\nstderr: %s", stdout, stderr)
}

// Trigger another test case of m0's ID getting different from m1's.
Expand Down
28 changes: 14 additions & 14 deletions functional/platform/nspawn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,39 +294,39 @@ func (nc *nspawnCluster) prepCluster() (err error) {
return
}

stdout, _, err := run("brctl show")
stdout, stderr, err := run("brctl show")
if err != nil {
log.Printf("Failed enumerating bridges: %v", err)
log.Printf("Failed enumerating bridges: %v\nstdout: %s\nstderr: %s", err, stdout, stderr)
return
}

if !strings.Contains(stdout, "fleet0") {
_, _, err = run("brctl addbr fleet0")
stdout, stderr, err = run("brctl addbr fleet0")
if err != nil {
log.Printf("Failed adding fleet0 bridge: %v", err)
log.Printf("Failed adding fleet0 bridge: %v\nstdout: %s\nstderr: %s", err, stdout, stderr)
return
}
} else {
log.Printf("Bridge fleet0 already exists")
}

stdout, _, err = run("ip addr list fleet0")
stdout, stderr, err = run("ip addr list fleet0")
if err != nil {
log.Printf("Failed listing fleet0 addresses: %v", err)
log.Printf("Failed listing fleet0 addresses: %v\nstdout: %s\nstderr: %s", err, stdout, stderr)
return
}

if !strings.Contains(stdout, "172.18.0.1/16") {
_, _, err = run("ip addr add 172.18.0.1/16 dev fleet0")
stdout, stderr, err = run("ip addr add 172.18.0.1/16 dev fleet0")
if err != nil {
log.Printf("Failed adding 172.18.0.1/16 to fleet0: %v", err)
log.Printf("Failed adding 172.18.0.1/16 to fleet0: %v\nstdout: %s\nstderr: %s", err, stdout, stderr)
return
}
}

_, _, err = run("ip link set fleet0 up")
stdout, stderr, err = run("ip link set fleet0 up")
if err != nil {
log.Printf("Failed bringing up fleet0 bridge: %v", err)
log.Printf("Failed bringing up fleet0 bridge: %v\nstdout: %s\nstderr: %s", err, stdout, stderr)
return
}

Expand Down Expand Up @@ -603,8 +603,8 @@ func (nc *nspawnCluster) ReplaceMember(m Member) (Member, error) {
label := fmt.Sprintf("%s%s", nc.name, m.ID())

cmd := fmt.Sprintf("machinectl poweroff %s", label)
if _, _, err := run(cmd); err != nil {
return nil, fmt.Errorf("poweroff failed: %v", err)
if stdout, stderr, err := run(cmd); err != nil {
return nil, fmt.Errorf("poweroff failed: %v\nstdout: %s\nstderr: %s", err, stdout, stderr)
}

var mN Member
Expand Down Expand Up @@ -708,13 +708,13 @@ func (nc *nspawnCluster) systemd(unitName, exec string) error {
func (nc *nspawnCluster) machinePID(name string) (int, error) {
for i := 0; i < 100; i++ {
mach := fmt.Sprintf("%s%s", nc.name, name)
stdout, _, err := run(fmt.Sprintf("machinectl show -p Leader %s", mach))
stdout, stderr, err := run(fmt.Sprintf("machinectl show -p Leader %s", mach))
if err != nil {
if i != -1 {
time.Sleep(100 * time.Millisecond)
continue
}
return -1, fmt.Errorf("failed detecting machine %s status: %v", mach, err)
return -1, fmt.Errorf("failed detecting machine %s status: %v\nstdout: %s\nstderr: %s", mach, err, stdout, stderr)
}

out := strings.SplitN(strings.TrimSpace(stdout), "=", 2)
Expand Down
40 changes: 21 additions & 19 deletions functional/scheduling_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ func TestScheduleMachineOf(t *testing.T) {

// All 6 services should be visible immediately and become ACTIVE
// shortly thereafter
stdout, _, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
stdout, stderr, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
if err != nil {
t.Fatalf("Failed to run list-unit-files: %v", err)
t.Fatalf("Failed to run list-unit-files:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
units := strings.Split(strings.TrimSpace(stdout), "\n")
if len(units) != 6 {
Expand Down Expand Up @@ -113,8 +113,8 @@ func TestScheduleMachineOf(t *testing.T) {

// Ensure a pair of units migrate together when their host goes down
mach := states["ping.1.service"].Machine
if _, _, err = cluster.Fleetctl(m0, "--strict-host-key-checking=false", "ssh", mach, "sudo", "systemctl", "stop", "fleet"); err != nil {
t.Fatal(err)
if stdout, stderr, err = cluster.Fleetctl(m0, "--strict-host-key-checking=false", "ssh", mach, "sudo", "systemctl", "stop", "fleet"); err != nil {
t.Fatalf("Failed to stop fleet service:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}

var mN platform.Member
Expand Down Expand Up @@ -184,9 +184,9 @@ func TestScheduleConflicts(t *testing.T) {

// All 5 services should be visible immediately and 3 should become
// ACTIVE shortly thereafter
stdout, _, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
stdout, stderr, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
if err != nil {
t.Fatalf("Failed to run list-unit-files: %v", err)
t.Fatalf("Failed to run list-unit-files:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
units := strings.Split(strings.TrimSpace(stdout), "\n")
if len(units) != 5 {
Expand Down Expand Up @@ -256,9 +256,9 @@ func TestScheduleOneWayConflict(t *testing.T) {

// Both units should show up, but only conflicts-with-hello.service
// should report ACTIVE
stdout, _, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
stdout, stderr, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
if err != nil {
t.Fatalf("Failed to run list-unit-files: %v", err)
t.Fatalf("Failed to run list-unit-files:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
units := strings.Split(strings.TrimSpace(stdout), "\n")
if len(units) != 2 {
Expand All @@ -281,8 +281,8 @@ func TestScheduleOneWayConflict(t *testing.T) {

// Destroying the conflicting unit should allow the other to start
name = "conflicts-with-hello.service"
if _, _, err := cluster.Fleetctl(m0, "destroy", name); err != nil {
t.Fatalf("Failed destroying %s", name)
if stdout, stderr, err := cluster.Fleetctl(m0, "destroy", name); err != nil {
t.Fatalf("Failed destroying %s:\nstdout: %s\nstderr: %s\nerr: %v", name, stdout, stderr, err)
}

// NOTE: we need to sleep here shortly to avoid occasional errors of
Expand All @@ -295,13 +295,14 @@ func TestScheduleOneWayConflict(t *testing.T) {
time.Sleep(1 * time.Second)

// Wait for the destroyed unit to actually disappear
var stdoutBuf, stderrBuf string
timeout, err := util.WaitForState(
func() bool {
stdout, _, err := cluster.Fleetctl(m0, "list-units", "--no-legend", "--full", "--fields", "unit,active,machine")
stdoutBuf, stderrBuf, err = cluster.Fleetctl(m0, "list-units", "--no-legend", "--full", "--fields", "unit,active,machine")
if err != nil {
return false
}
lines := strings.Split(strings.TrimSpace(stdout), "\n")
lines := strings.Split(strings.TrimSpace(stdoutBuf), "\n")
states := util.ParseUnitStates(lines)
for _, state := range states {
if state.Name == name {
Expand All @@ -312,7 +313,8 @@ func TestScheduleOneWayConflict(t *testing.T) {
},
)
if err != nil {
t.Fatalf("Destroyed unit %s not gone within %v", name, timeout)
t.Fatalf("Destroyed unit %s not gone within %v\nstdout: %s\nstderr: %s\nerr: %v",
name, timeout, stdoutBuf, stderrBuf, err)
}

active, err = cluster.WaitForNActiveUnits(m0, 1)
Expand Down Expand Up @@ -374,9 +376,9 @@ func TestScheduleReplace(t *testing.T) {
}

// Check that both units should show up
stdout, _, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
stdout, stderr, err := cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
if err != nil {
t.Fatalf("Failed to run list-unit-files: %v", err)
t.Fatalf("Failed to run list-unit-files:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
units := strings.Split(strings.TrimSpace(stdout), "\n")
if len(units) != 2 {
Expand Down Expand Up @@ -450,9 +452,9 @@ func TestScheduleCircularReplace(t *testing.T) {
uName0tmp, stdout, stderr, err)
}

stdout, _, err = cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
stdout, stderr, err = cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
if err != nil {
t.Fatalf("Failed to run list-unit-files: %v", err)
t.Fatalf("Failed to run list-unit-files:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
units := strings.Split(strings.TrimSpace(stdout), "\n")
if len(units) != nActiveUnits {
Expand All @@ -472,9 +474,9 @@ func TestScheduleCircularReplace(t *testing.T) {
if stdout, stderr, err := cluster.Fleetctl(m0, "start", "--no-block", uNames[1]); err != nil {
t.Fatalf("Failed starting unit %s: \nstdout: %s\nstderr: %s\nerr: %v", uNames[1], stdout, stderr, err)
}
stdout, _, err = cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
stdout, stderr, err = cluster.Fleetctl(m0, "list-unit-files", "--no-legend")
if err != nil {
t.Fatalf("Failed to run list-unit-files: %v", err)
t.Fatalf("Failed to run list-unit-files:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err)
}
units = strings.Split(strings.TrimSpace(stdout), "\n")
if len(units) != nUnits {
Expand Down
5 changes: 3 additions & 2 deletions functional/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,10 @@ func TestReconfigureServer(t *testing.T) {

// check if fleetd is still running correctly, by running fleetctl status
// Even if the log message do not show up this test may catch the error.
stdout, _, err = cluster.Fleetctl(m0, "list-units")
stdout, stderr, err = cluster.Fleetctl(m0, "list-units")
if err != nil {
t.Fatalf("Unable to check list-units. Please check for fleetd socket. err:%v", err)
t.Fatalf("Unable to check list-units. Please check for fleetd socket\nstdout: %s\nstderr: %s\nerr:%v",
stdout, stderr, err)
}

// Ensure that fleet received SIGHUP, if not then just skip this test
Expand Down
Loading

0 comments on commit 40a90d0

Please sign in to comment.