ef0999547a
Add a skip condition to all tests slower than 100ms. This change was made using `gotestsum tool slowest` with data from the last 3 CI runs of master. See https://github.com/gotestyourself/gotestsum#finding-and-skipping-slow-tests With this change: ``` $ time go test -count=1 -short ./agent ok github.com/hashicorp/consul/agent 0.743s real 0m4.791s $ time go test -count=1 -short ./agent/consul ok github.com/hashicorp/consul/agent/consul 4.229s real 0m8.769s ```
123 lines
3.5 KiB
Go
123 lines
3.5 KiB
Go
package monitor
|
|
|
|
import (
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/hashicorp/consul/agent"
|
|
"github.com/mitchellh/cli"
|
|
)
|
|
|
|
func TestMonitorCommand_exitsOnSignalBeforeLinesArrive(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("too slow for testing.Short")
|
|
}
|
|
|
|
t.Parallel()
|
|
a := agent.StartTestAgent(t, agent.TestAgent{})
|
|
defer a.Shutdown()
|
|
|
|
shutdownCh := make(chan struct{})
|
|
|
|
ui := cli.NewMockUi()
|
|
c := New(ui, shutdownCh)
|
|
// Only wait for ERR which shouldn't happen so should leave logs empty for a
|
|
// while
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-log-level=ERR"}
|
|
|
|
// Buffer it so we don't deadlock when blocking send on shutdownCh triggers
|
|
// Run to return before we can select on it.
|
|
exitCode := make(chan int, 1)
|
|
|
|
// Run the monitor in another go routine. If this doesn't exit on our "signal"
|
|
// then the whole test will hang and we'll panic (to not blow up if people run
|
|
// the suite without -timeout)
|
|
var wg sync.WaitGroup
|
|
wg.Add(1)
|
|
go func() {
|
|
wg.Done() // Signal that this goroutine is at least running now
|
|
exitCode <- c.Run(args)
|
|
}()
|
|
|
|
// Wait for that routine to at least be running
|
|
wg.Wait()
|
|
|
|
// Simulate signal in a few milliseconds without blocking this thread
|
|
go func() {
|
|
time.Sleep(5 * time.Millisecond)
|
|
shutdownCh <- struct{}{}
|
|
}()
|
|
|
|
// Wait for a second - shouldn't take long to handle the signal before we
|
|
// panic. We simulate inside the select since the other goroutine might
|
|
// already have exited if there was some error and we'd block forever trying
|
|
// to write to unbuffered shutdownCh. We don't just buffer it because then it
|
|
// doesn't model the real shutdownCh we use for signal watching and could mask
|
|
// bugs in the handling.
|
|
select {
|
|
case ret := <-exitCode:
|
|
if ret != 0 {
|
|
t.Fatal("command returned with non-zero code")
|
|
}
|
|
// OK!
|
|
case <-time.After(1 * time.Second):
|
|
t.Fatal("timed out waiting for exit")
|
|
}
|
|
}
|
|
|
|
func TestMonitorCommand_LogJSONValidFlag(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("too slow for testing.Short")
|
|
}
|
|
|
|
t.Parallel()
|
|
a := agent.StartTestAgent(t, agent.TestAgent{})
|
|
defer a.Shutdown()
|
|
|
|
shutdownCh := make(chan struct{})
|
|
|
|
ui := cli.NewMockUi()
|
|
c := New(ui, shutdownCh)
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-log-json"}
|
|
|
|
// Buffer it so we don't deadlock when blocking send on shutdownCh triggers
|
|
// Run to return before we can select on it.
|
|
exitCode := make(chan int, 1)
|
|
|
|
// Run the monitor in another go routine. If this doesn't exit on our "signal"
|
|
// then the whole test will hang and we'll panic (to not blow up if people run
|
|
// the suite without -timeout)
|
|
var wg sync.WaitGroup
|
|
wg.Add(1)
|
|
go func() {
|
|
wg.Done() // Signal that this goroutine is at least running now
|
|
exitCode <- c.Run(args)
|
|
}()
|
|
|
|
// Wait for that routine to at least be running
|
|
wg.Wait()
|
|
|
|
// Simulate signal in a few milliseconds without blocking this thread
|
|
go func() {
|
|
time.Sleep(5 * time.Millisecond)
|
|
shutdownCh <- struct{}{}
|
|
}()
|
|
|
|
// Wait for a second - shouldn't take long to handle the signal before we
|
|
// panic. We simulate inside the select since the other goroutine might
|
|
// already have exited if there was some error and we'd block forever trying
|
|
// to write to unbuffered shutdownCh. We don't just buffer it because then it
|
|
// doesn't model the real shutdownCh we use for signal watching and could mask
|
|
// bugs in the handling.
|
|
select {
|
|
case ret := <-exitCode:
|
|
if ret != 0 {
|
|
t.Fatal("command returned with non-zero code")
|
|
}
|
|
// OK!
|
|
case <-time.After(1 * time.Second):
|
|
t.Fatal("timed out waiting for exit")
|
|
}
|
|
}
|