Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sort import lines #160

Merged
merged 1 commit into from
Oct 23, 2017
Merged

Sort import lines #160

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 activeinactive/activeinactive_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"fmt"
"testing"

"github.com/updatehub/updatehub/testsmocks/cmdlinemock"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/testsmocks/cmdlinemock"
)

func TestDefaultImplActive(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion client/report_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"net/url"
"testing"

"github.com/updatehub/updatehub/metadata"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/metadata"
)

func TestReportState(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion client/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/installmodes/imxkobs"
"github.com/updatehub/updatehub/metadata"
"github.com/stretchr/testify/assert"
)

func TestProbeUpdateWithInvalidApiRequester(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/updatehub-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import (
"time"

"github.com/OSSystems/pkg/log"
"github.com/parnurzeal/gorequest"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
_ "github.com/updatehub/updatehub/installmodes/copy"
_ "github.com/updatehub/updatehub/installmodes/flash"
_ "github.com/updatehub/updatehub/installmodes/imxkobs"
Expand All @@ -25,9 +28,6 @@ import (
"github.com/updatehub/updatehub/metadata"
"github.com/updatehub/updatehub/server"
"github.com/updatehub/updatehub/updatehub"
"github.com/parnurzeal/gorequest"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

type AgentInfo struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/updatehub/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import (
"testing"
"time"

"github.com/go-ini/ini"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/testsmocks/activeinactivemock"
"github.com/updatehub/updatehub/testsmocks/filemock"
"github.com/updatehub/updatehub/testsmocks/filesystemmock"
"github.com/updatehub/updatehub/updatehub"
"github.com/go-ini/ini"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
)

func TestLoadSettings(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions copy/copy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"time"

"github.com/OSSystems/pkg/log"
"github.com/updatehub/updatehub/libarchive"
"github.com/updatehub/updatehub/utils"
shellwords "github.com/mattn/go-shellwords"
"github.com/spf13/afero"
"github.com/updatehub/updatehub/libarchive"
"github.com/updatehub/updatehub/utils"
)

type Interface interface {
Expand Down
2 changes: 1 addition & 1 deletion installifdifferent/installifdifferent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"fmt"

"github.com/OSSystems/pkg/log"
"github.com/spf13/afero"
"github.com/updatehub/updatehub/metadata"
"github.com/updatehub/updatehub/utils"
"github.com/spf13/afero"
)

type Interface interface {
Expand Down
4 changes: 2 additions & 2 deletions installifdifferent/installifdifferent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"fmt"
"testing"

"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/installmodes"
"github.com/updatehub/updatehub/metadata"
"github.com/updatehub/updatehub/testsmocks/filemock"
"github.com/updatehub/updatehub/testsmocks/filesystemmock"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion installifdifferent/kernelfileinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"regexp"
"unicode"

"github.com/spf13/afero"
"github.com/updatehub/updatehub/libarchive"
"github.com/updatehub/updatehub/utils"
"github.com/spf13/afero"
)

type LinuxArch int
Expand Down
4 changes: 2 additions & 2 deletions installifdifferent/kernelfileinfo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"fmt"
"testing"

"github.com/updatehub/updatehub/testsmocks/filemock"
"github.com/updatehub/updatehub/testsmocks/filesystemmock"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/updatehub/updatehub/testsmocks/filemock"
"github.com/updatehub/updatehub/testsmocks/filesystemmock"
)

func TestNewKernelFileInfoWithInvalidFilename(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions installifdifferent/pattern_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"path"
"testing"

"github.com/updatehub/updatehub/testsmocks/filemock"
"github.com/updatehub/updatehub/testsmocks/filesystemmock"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/testsmocks/filemock"
"github.com/updatehub/updatehub/testsmocks/filesystemmock"
)

func TestIsValid(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions installmodes/copy/copy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import (
"path/filepath"
"testing"

"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/copy"
"github.com/updatehub/updatehub/installmodes"
"github.com/updatehub/updatehub/libarchive"
Expand All @@ -23,8 +25,6 @@ import (
"github.com/updatehub/updatehub/testsmocks/libarchivemock"
"github.com/updatehub/updatehub/testsmocks/permissionsmock"
"github.com/updatehub/updatehub/utils"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
)

func TestCopyInit(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions installmodes/raw/raw_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
"path"
"testing"

"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/copy"
"github.com/updatehub/updatehub/installmodes"
"github.com/updatehub/updatehub/libarchive"
"github.com/updatehub/updatehub/testsmocks/copymock"
"github.com/updatehub/updatehub/testsmocks/filesystemmock"
"github.com/updatehub/updatehub/testsmocks/libarchivemock"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
)

func TestRawInit(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions installmodes/tarball/tarball_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import (
"path"
"testing"

"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/copy"
"github.com/updatehub/updatehub/installmodes"
"github.com/updatehub/updatehub/libarchive"
Expand All @@ -22,8 +24,6 @@ import (
"github.com/updatehub/updatehub/testsmocks/mtdmock"
"github.com/updatehub/updatehub/testsmocks/ubifsmock"
"github.com/updatehub/updatehub/utils"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
)

func TestTarballInit(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions metadata/firmware_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"syscall"
"testing"

"github.com/updatehub/updatehub/installmodes"
"github.com/updatehub/updatehub/testsmocks/cmdlinemock"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/installmodes"
"github.com/updatehub/updatehub/testsmocks/cmdlinemock"
)

func TestNewFirmwareMetadataWithInexistantPath(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion metadata/object_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ package metadata
import (
"testing"

"github.com/updatehub/updatehub/installmodes"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/installmodes"
)

type TestObject struct {
Expand Down
2 changes: 1 addition & 1 deletion metadata/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"errors"
"testing"

"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/installmodes"
"github.com/updatehub/updatehub/utils"
"github.com/stretchr/testify/assert"
)

type TestObjectCompressed struct {
Expand Down
2 changes: 1 addition & 1 deletion server/agent_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"net/http"

"github.com/OSSystems/pkg/log"
"github.com/julienschmidt/httprouter"
"github.com/updatehub/updatehub/client"
"github.com/updatehub/updatehub/updatehub"
"github.com/updatehub/updatehub/utils"
"github.com/julienschmidt/httprouter"
)

type AgentBackend struct {
Expand Down
6 changes: 3 additions & 3 deletions server/agent_backend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import (
"testing"
"time"

"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/updatehub/updatehub/client"
"github.com/updatehub/updatehub/metadata"
"github.com/updatehub/updatehub/testsmocks/cmdlinemock"
Expand All @@ -26,9 +29,6 @@ import (
"github.com/updatehub/updatehub/testsmocks/reportermock"
"github.com/updatehub/updatehub/testsmocks/responsewritermock"
"github.com/updatehub/updatehub/updatehub"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion server/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"path"

"github.com/OSSystems/pkg/log"
"github.com/updatehub/updatehub/metadata"
"github.com/fsnotify/fsnotify"
"github.com/updatehub/updatehub/metadata"
)

type Daemon struct {
Expand Down
2 changes: 1 addition & 1 deletion server/daemon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/metadata"
"github.com/updatehub/updatehub/testsmocks/libarchivemock"
"github.com/stretchr/testify/assert"
)

func TestNewDaemon(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/server_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"strings"

"github.com/OSSystems/pkg/log"
"github.com/julienschmidt/httprouter"
"github.com/updatehub/updatehub/libarchive"
"github.com/updatehub/updatehub/metadata"
"github.com/updatehub/updatehub/utils"
"github.com/julienschmidt/httprouter"
)

type SelectedPackage struct {
Expand Down
4 changes: 2 additions & 2 deletions server/server_backend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import (
"reflect"
"testing"

"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/libarchive"
"github.com/updatehub/updatehub/metadata"
"github.com/updatehub/updatehub/testsmocks/libarchivemock"
"github.com/updatehub/updatehub/utils"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion testsmocks/controllermock/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ package controllermock
import (
"time"

"github.com/stretchr/testify/mock"
"github.com/updatehub/updatehub/client"
"github.com/updatehub/updatehub/metadata"
"github.com/stretchr/testify/mock"
)

type ControllerMock struct {
Expand Down
2 changes: 1 addition & 1 deletion testsmocks/controllermock/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/client"
"github.com/updatehub/updatehub/metadata"
"github.com/stretchr/testify/assert"
)

func TestProbeUpdate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion testsmocks/copymock/copy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"testing"
"time"

"github.com/updatehub/updatehub/testsmocks/filesystemmock"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/testsmocks/filesystemmock"
)

func TestCopyFile(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion testsmocks/installifdifferentmock/installifdifferent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
package installifdifferentmock

import (
"github.com/updatehub/updatehub/metadata"
"github.com/stretchr/testify/mock"
"github.com/updatehub/updatehub/metadata"
)

type InstallIfDifferentMock struct {
Expand Down
2 changes: 1 addition & 1 deletion testsmocks/installifdifferentmock/installifdifferent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"fmt"
"testing"

"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/installmodes/copy"
"github.com/updatehub/updatehub/metadata"
"github.com/stretchr/testify/assert"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion testsmocks/libarchivemock/libarchive_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"fmt"
"testing"

"github.com/updatehub/updatehub/libarchive"
"github.com/stretchr/testify/assert"
"github.com/updatehub/updatehub/libarchive"
)

func TestNewRead(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion testsmocks/objectmock/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
package objectmock

import (
"github.com/updatehub/updatehub/metadata"
"github.com/stretchr/testify/mock"
"github.com/updatehub/updatehub/metadata"
)

type ObjectMock struct {
Expand Down
2 changes: 1 addition & 1 deletion testsmocks/reportermock/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
package reportermock

import (
"github.com/stretchr/testify/mock"
"github.com/updatehub/updatehub/client"
"github.com/updatehub/updatehub/metadata"
"github.com/stretchr/testify/mock"
)

type ReporterMock struct {
Expand Down
Loading