changes to appease gofmt

This commit is contained in:
Chris Baker
2019-04-12 19:12:42 +00:00
parent f011f61645
commit 165244a9b7
3 changed files with 12 additions and 11 deletions

View File

@@ -1,8 +1,9 @@
package command
import (
"github.com/mitchellh/cli"
"strings"
"github.com/mitchellh/cli"
)
type JobPeriodicCommand struct {
@@ -34,5 +35,3 @@ Usage: nomad job periodic <subcommand> [options] [args]
`
return strings.TrimSpace(helpText)
}

View File

@@ -2,9 +2,10 @@ package command
import (
"fmt"
"github.com/hashicorp/nomad/api"
"strings"
"github.com/hashicorp/nomad/api"
"github.com/posener/complete"
)
@@ -45,8 +46,8 @@ func (c *JobPeriodicForceCommand) Synopsis() string {
func (c *JobPeriodicForceCommand) AutocompleteFlags() complete.Flags {
return mergeAutocompleteFlags(c.Meta.AutocompleteFlags(FlagSetClient),
complete.Flags{
"-detach": complete.PredictNothing,
"-verbose": complete.PredictNothing,
"-detach": complete.PredictNothing,
"-verbose": complete.PredictNothing,
})
}

View File

@@ -2,12 +2,13 @@ package command
import (
"fmt"
"strings"
"testing"
"github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/helper"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/stretchr/testify/require"
"strings"
"testing"
"github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/testutil"
@@ -112,7 +113,7 @@ func TestJobPeriodicForceCommand_NonPeriodicJob(t *testing.T) {
code := waitForSuccess(ui, client, fullId, t, resp.EvalID)
require.Equal(t, 0, code)
code = cmd.Run([]string{"-address="+url, "job_not_periodic"})
code = cmd.Run([]string{"-address=" + url, "job_not_periodic"})
require.Equal(t, 1, code, "expected exit code")
out := ui.ErrorWriter.String()
require.Contains(t, out, "No periodic job(s)", "non-periodic error message")
@@ -153,7 +154,7 @@ func TestJobPeriodicForceCommand_SuccessfulPeriodicForceDetach(t *testing.T) {
_, _, err := client.Jobs().Register(j, nil)
require.NoError(t, err)
code := cmd.Run([]string{"-address="+url, "-detach", "job1_is_periodic"})
code := cmd.Run([]string{"-address=" + url, "-detach", "job1_is_periodic"})
require.Equal(t, 0, code, "expected no error code")
out := ui.OutputWriter.String()
require.Contains(t, out, "Force periodic successful")
@@ -195,7 +196,7 @@ func TestJobPeriodicForceCommand_SuccessfulPeriodicForce(t *testing.T) {
_, _, err := client.Jobs().Register(j, nil)
require.NoError(t, err)
code := cmd.Run([]string{"-address="+url, "job2_is_periodic"})
code := cmd.Run([]string{"-address=" + url, "job2_is_periodic"})
require.Equal(t, 0, code, "expected no error code")
out := ui.OutputWriter.String()
require.Contains(t, out, "Monitoring evaluation")