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

Cleanup: functional tests: Drop gratuitous sudo from various commands #1528

Merged
tixxdz merged 1 commit into from
Apr 4, 2016
Merged

Cleanup: functional tests: Drop gratuitous sudo from various commands #1528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion functional/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func TestNodeShutdown(t *testing.T) {
}

// The member's unit should actually stop running, too
stdout, _ = cluster.MemberCommand(m0, "sudo", "systemctl", "status", "hello.service")
stdout, _ = cluster.MemberCommand(m0, "systemctl", "status", "hello.service")
if !strings.Contains(stdout, "Active: inactive") {
t.Fatalf("Unit hello.service not reported as inactive:\n%s\n", stdout)
}
Expand Down
8 changes: 4 additions & 4 deletions functional/shutdown_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ func TestShutdown(t *testing.T) {
}

// Check expected state after stop.
stdout, _ := cluster.MemberCommand(m0, "sudo", "systemctl", "show", "--property=ActiveState", "fleet")
stdout, _ := cluster.MemberCommand(m0, "systemctl", "show", "--property=ActiveState", "fleet")
if strings.TrimSpace(stdout) != "ActiveState=inactive" {
t.Fatalf("Fleet unit not reported as inactive: %s", stdout)
}
stdout, _ = cluster.MemberCommand(m0, "sudo", "systemctl", "show", "--property=Result", "fleet")
stdout, _ = cluster.MemberCommand(m0, "systemctl", "show", "--property=Result", "fleet")
if strings.TrimSpace(stdout) != "Result=success" {
t.Fatalf("Result for fleet unit not reported as success: %s", stdout)
}
Expand Down Expand Up @@ -91,11 +91,11 @@ func TestShutdownVsMonitor(t *testing.T) {
}

// Verify that fleetd was shut down cleanly in spite of the concurrent restart.
stdout, _ := cluster.MemberCommand(m0, "sudo", "systemctl", "show", "--property=ActiveState", "fleet")
stdout, _ := cluster.MemberCommand(m0, "systemctl", "show", "--property=ActiveState", "fleet")
if strings.TrimSpace(stdout) != "ActiveState=inactive" {
t.Fatalf("Fleet unit not reported as inactive: %s", stdout)
}
stdout, _ = cluster.MemberCommand(m0, "sudo", "systemctl", "show", "--property=Result", "fleet")
stdout, _ = cluster.MemberCommand(m0, "systemctl", "show", "--property=Result", "fleet")
if strings.TrimSpace(stdout) != "Result=success" {
t.Fatalf("Result for fleet unit not reported as success: %s", stdout)
}
Expand Down