Skip to content

Commit

Permalink
Run fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke Kysow committed Oct 6, 2017
1 parent e2443ae commit 770b071
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ release: ## Create packages for a release
./scripts/binary-release.sh

fmt: ## Run goimports (which also formats)
goimports -w $$(find . -type f -name '*.go' ! -path "./vendor/*" ! -path "./server/bindata_assetfs.go" ! -path "**/mocks/*")
goimports -w $$(find . -type f -name '*.go' ! -path "./vendor/*" ! -path "./static/bindata_assetfs.go" ! -path "**/mocks/*")

end-to-end-deps: ## Install e2e dependencies
./scripts/e2e-deps.sh
Expand Down
5 changes: 3 additions & 2 deletions locking/locking_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import (
"testing"
"time"

"reflect"
"strings"

"github.com/hootsuite/atlantis/locking"
"github.com/hootsuite/atlantis/locking/mocks"
"github.com/hootsuite/atlantis/models"
. "github.com/hootsuite/atlantis/testing_util"
. "github.com/petergtz/pegomock"
"reflect"
"strings"
)

var project = models.NewProject("owner/repo", "path")
Expand Down
5 changes: 3 additions & 2 deletions server/command_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"os"
"testing"

"reflect"

"github.com/google/go-github/github"
gh "github.com/hootsuite/atlantis/github/fixtures"
ghmocks "github.com/hootsuite/atlantis/github/mocks"
Expand All @@ -14,9 +16,8 @@ import (
"github.com/hootsuite/atlantis/server"
"github.com/hootsuite/atlantis/server/mocks"
. "github.com/hootsuite/atlantis/testing_util"
. "github.com/petergtz/pegomock"
"github.com/mohae/deepcopy"
"reflect"
. "github.com/petergtz/pegomock"
)

func TestExecuteCommand_PullErr(t *testing.T) {
Expand Down
13 changes: 7 additions & 6 deletions server/github_comment_renderer_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package server_test

import (
"errors"
"testing"

"github.com/hootsuite/atlantis/server"
. "github.com/hootsuite/atlantis/testing_util"
"errors"
)

func TestRenderErr(t *testing.T) {
Expand Down Expand Up @@ -196,11 +197,11 @@ func TestRenderProjectResults(t *testing.T) {
},
},
{
Path: "path2",
Path: "path2",
Failure: "failure",
},
{
Path: "path3",
Path: "path3",
Error: errors.New("error"),
},
},
Expand All @@ -211,15 +212,15 @@ func TestRenderProjectResults(t *testing.T) {
server.Apply,
[]server.ProjectResult{
{
Path: "path",
Path: "path",
ApplySuccess: "success",
},
{
Path: "path2",
Path: "path2",
Failure: "failure",
},
{
Path: "path3",
Path: "path3",
Error: errors.New("error"),
},
},
Expand Down
5 changes: 3 additions & 2 deletions server/github_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ package server_test
import (
"testing"

"errors"
"strings"

"github.com/hootsuite/atlantis/github/mocks"
"github.com/hootsuite/atlantis/models"
"github.com/hootsuite/atlantis/server"
. "github.com/hootsuite/atlantis/testing_util"
. "github.com/petergtz/pegomock"
"strings"
"errors"
)

var repoModel = models.Repo{}
Expand Down
2 changes: 1 addition & 1 deletion server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"github.com/hootsuite/atlantis/logging"
"github.com/hootsuite/atlantis/models"
"github.com/hootsuite/atlantis/run"
"github.com/hootsuite/atlantis/static"
"github.com/hootsuite/atlantis/terraform"
homedir "github.com/mitchellh/go-homedir"
"github.com/pkg/errors"
"github.com/urfave/cli"
"github.com/urfave/negroni"
"github.com/hootsuite/atlantis/static"
)

const (
Expand Down

0 comments on commit 770b071

Please sign in to comment.