Skip to content

Commit

Permalink
fix travis
Browse files Browse the repository at this point in the history
  • Loading branch information
ivcosla committed Sep 4, 2019
1 parent 8259c08 commit 5d702cf
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 10 deletions.
3 changes: 2 additions & 1 deletion pkg/therealssh/pty_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import (
"github.com/creack/pty"
"github.com/skycoin/dmsg/cipher"
"github.com/skycoin/skycoin/src/util/logging"
"github.com/skycoin/skywire/pkg/routing"
"github.com/stretchr/testify/require"

"github.com/skycoin/skywire/pkg/routing"
)

func TestRunRPC(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/therealssh/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import (

"github.com/skycoin/dmsg/cipher"
"github.com/skycoin/skycoin/src/util/logging"
"github.com/skycoin/skywire/pkg/routing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/skycoin/skywire/pkg/routing"
)

func TestMain(m *testing.M) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/visor/rpc_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ package visor
import (
"encoding/binary"
"fmt"
"github.com/skycoin/skywire/pkg/router"
"math/rand"
"net/http"
"net/rpc"
"sync"
"time"

"github.com/skycoin/skywire/pkg/router"

"github.com/google/uuid"
"github.com/skycoin/dmsg/cipher"
"github.com/skycoin/skycoin/src/util/logging"
Expand Down
5 changes: 3 additions & 2 deletions pkg/visor/rpc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ import (

"github.com/skycoin/dmsg/cipher"
"github.com/skycoin/skycoin/src/util/logging"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/util/pathutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/util/pathutil"
)

func TestHealth(t *testing.T) {
Expand Down
15 changes: 10 additions & 5 deletions pkg/visor/visor_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build !no_ci

package visor

import (
Expand All @@ -15,12 +13,13 @@ import (

"github.com/skycoin/dmsg/cipher"
"github.com/skycoin/skycoin/src/util/logging"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/skycoin/skywire/pkg/app"
"github.com/skycoin/skywire/pkg/routing"
"github.com/skycoin/skywire/pkg/transport"
"github.com/skycoin/skywire/pkg/util/pathutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

var masterLogger *logging.MasterLogger
Expand Down Expand Up @@ -152,15 +151,21 @@ func TestNodeSpawnApp(t *testing.T) {
}

func TestNodeSpawnAppValidations(t *testing.T) {
pk, _ := cipher.GenerateKeyPair()
conn, _ := net.Pipe()
r := new(mockRouter)
executer := &MockExecuter{err: errors.New("foo")}
defer func() {
require.NoError(t, os.RemoveAll("skychat"))
}()
c := &Config{}
c.Node.StaticPubKey = pk
node := &Node{router: r, executer: executer,
startedApps: map[string]*appBind{"skychat": {conn, 10}},
logger: logging.MustGetLogger("test")}
logger: logging.MustGetLogger("test"),
config: c,
}
defer os.Remove(node.dir()) // nolint

cases := []struct {
conf *AppConfig
Expand Down

0 comments on commit 5d702cf

Please sign in to comment.