monitor command takes no args

rm extra new line

fix lint errors

return after close

fix, simplify test
This commit is contained in:
Drew Bailey
2019-11-01 11:06:49 -04:00
parent 9a96c10d4c
commit f74bd99b2a
5 changed files with 20 additions and 18 deletions

View File

@@ -22,20 +22,23 @@ func TestMonitor_Start(t *testing.T) {
})
closeCh := make(chan struct{})
defer close(closeCh)
logCh := m.Start(closeCh)
go func() {
for {
select {
case log := <-logCh:
require.Contains(t, string(log), "[DEBUG] test log")
case <-time.After(1 * time.Second):
t.Fatal("Expected to receive from log channel")
}
}
logger.Debug("test log")
time.Sleep(10 * time.Millisecond)
}()
logger.Debug("test log")
for {
select {
case log := <-logCh:
require.Contains(t, string(log), "[DEBUG] test log")
return
case <-time.After(3 * time.Second):
t.Fatal("Expected to receive from log channel")
}
}
}
// Ensure number of dropped messages are logged
@@ -61,7 +64,6 @@ func TestMonitor_DroppedMessages(t *testing.T) {
}
received := ""
passed := make(chan struct{})
go func() {
for {

View File

@@ -74,6 +74,13 @@ func (c *MonitorCommand) Run(args []string) int {
return 1
}
args = flags.Args()
if l := len(args); l != 0 {
c.Ui.Error("This command takes no arguments")
c.Ui.Error(commandErrorText(c))
return 1
}
client, err := c.Meta.Client()
if err != nil {
c.Ui.Error(fmt.Sprintf("Error initializing client: %s", err))