Tests are working again
This commit is contained in:
Jonathan Leibiusky @xetorthio
@@ -1,57 +1,43 @@
|
||||
package pwd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/play-with-docker/play-with-docker/config"
|
||||
"github.com/play-with-docker/play-with-docker/docker"
|
||||
"github.com/play-with-docker/play-with-docker/event"
|
||||
"github.com/play-with-docker/play-with-docker/pwd/types"
|
||||
"github.com/play-with-docker/play-with-docker/storage"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/mock"
|
||||
)
|
||||
|
||||
func TestSessionNew(t *testing.T) {
|
||||
config.PWDContainerName = "pwd"
|
||||
var connectContainerName, connectNetworkName, connectIP string
|
||||
createdNetworkId := ""
|
||||
saveCalled := false
|
||||
expectedSessions := map[string]*types.Session{}
|
||||
|
||||
docker := &mockDocker{}
|
||||
docker.createNetwork = func(id string) error {
|
||||
createdNetworkId = id
|
||||
return nil
|
||||
}
|
||||
docker.connectNetwork = func(containerName, networkName, ip string) (string, error) {
|
||||
connectContainerName = containerName
|
||||
connectNetworkName = networkName
|
||||
connectIP = ip
|
||||
return "10.0.0.1", nil
|
||||
}
|
||||
sp := &mockSessionProvider{docker: docker}
|
||||
_d := &docker.Mock{}
|
||||
_f := &docker.FactoryMock{}
|
||||
_s := &storage.Mock{}
|
||||
_g := &mockGenerator{}
|
||||
_e := &event.Mock{}
|
||||
|
||||
var scheduledSession *types.Session
|
||||
tasks := &mockTasks{}
|
||||
tasks.schedule = func(s *types.Session) {
|
||||
scheduledSession = s
|
||||
}
|
||||
_g.On("NewId").Return("aaaabbbbcccc")
|
||||
_f.On("GetForSession", "aaaabbbbcccc").Return(_d, nil)
|
||||
_d.On("CreateNetwork", "aaaabbbbcccc").Return(nil)
|
||||
_d.On("ConnectNetwork", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil)
|
||||
_s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil)
|
||||
_s.On("SessionCount").Return(1, nil)
|
||||
_s.On("InstanceCount").Return(0, nil)
|
||||
|
||||
ev := event.NewLocalBroker()
|
||||
storage := &mockStorage{}
|
||||
storage.sessionPut = func(s *types.Session) error {
|
||||
saveCalled = true
|
||||
return nil
|
||||
}
|
||||
var nilArgs []interface{}
|
||||
_e.M.On("Emit", event.SESSION_NEW, "aaaabbbbcccc", nilArgs).Return()
|
||||
|
||||
p := NewPWD(sp, tasks, ev, storage)
|
||||
p := NewPWD(_f, _e, _s)
|
||||
p.generator = _g
|
||||
|
||||
before := time.Now()
|
||||
|
||||
s, e := p.SessionNew(time.Hour, "", "", "")
|
||||
expectedSessions[s.Id] = s
|
||||
|
||||
assert.Nil(t, e)
|
||||
assert.NotNil(t, s)
|
||||
|
||||
@@ -60,119 +46,68 @@ func TestSessionNew(t *testing.T) {
|
||||
assert.NotEmpty(t, s.Id)
|
||||
assert.WithinDuration(t, s.CreatedAt, before, time.Since(before))
|
||||
assert.WithinDuration(t, s.ExpiresAt, before.Add(time.Hour), time.Second)
|
||||
assert.Equal(t, s.Id, createdNetworkId)
|
||||
assert.True(t, s.Ready)
|
||||
|
||||
s, _ = p.SessionNew(time.Hour, "stackPath", "stackName", "imageName")
|
||||
expectedSessions[s.Id] = s
|
||||
|
||||
assert.Equal(t, "stackPath", s.Stack)
|
||||
assert.Equal(t, "stackName", s.StackName)
|
||||
assert.Equal(t, "imageName", s.ImageName)
|
||||
assert.False(t, s.Ready)
|
||||
|
||||
assert.NotNil(t, s.ClosingTimer())
|
||||
|
||||
assert.Equal(t, config.PWDContainerName, connectContainerName)
|
||||
assert.Equal(t, s.Id, connectNetworkName)
|
||||
assert.Empty(t, connectIP)
|
||||
|
||||
assert.Equal(t, "10.0.0.1", s.PwdIpAddress)
|
||||
|
||||
assert.Equal(t, s, scheduledSession)
|
||||
|
||||
assert.True(t, saveCalled)
|
||||
_d.AssertExpectations(t)
|
||||
_f.AssertExpectations(t)
|
||||
_s.AssertExpectations(t)
|
||||
_g.AssertExpectations(t)
|
||||
_e.M.AssertExpectations(t)
|
||||
}
|
||||
|
||||
func TestSessionSetup(t *testing.T) {
|
||||
swarmInitOnMaster1 := false
|
||||
manager2JoinedHasManager := false
|
||||
manager3JoinedHasManager := false
|
||||
worker1JoinedHasWorker := false
|
||||
_d := &docker.Mock{}
|
||||
_f := &docker.FactoryMock{}
|
||||
_s := &storage.Mock{}
|
||||
_g := &mockGenerator{}
|
||||
_e := &event.Mock{}
|
||||
|
||||
dock := &mockDocker{}
|
||||
dock.createContainer = func(opts docker.CreateContainerOpts) (string, error) {
|
||||
if opts.Hostname == "manager1" {
|
||||
return "10.0.0.1", nil
|
||||
} else if opts.Hostname == "manager2" {
|
||||
return "10.0.0.2", nil
|
||||
} else if opts.Hostname == "manager3" {
|
||||
return "10.0.0.3", nil
|
||||
} else if opts.Hostname == "worker1" {
|
||||
return "10.0.0.4", nil
|
||||
} else if opts.Hostname == "other" {
|
||||
return "10.0.0.5", nil
|
||||
} else {
|
||||
assert.Fail(t, "Should not have reached here")
|
||||
}
|
||||
return "", nil
|
||||
}
|
||||
dock.new = func(ip string, cert, key []byte) (docker.DockerApi, error) {
|
||||
if ip == "10.0.0.1" {
|
||||
return &mockDocker{
|
||||
swarmInit: func() (*docker.SwarmTokens, error) {
|
||||
swarmInitOnMaster1 = true
|
||||
return &docker.SwarmTokens{Worker: "worker-join-token", Manager: "manager-join-token"}, nil
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
if ip == "10.0.0.2" {
|
||||
return &mockDocker{
|
||||
swarmInit: func() (*docker.SwarmTokens, error) {
|
||||
assert.Fail(t, "Shouldn't have reached here.")
|
||||
return nil, nil
|
||||
},
|
||||
swarmJoin: func(addr, token string) error {
|
||||
if addr == "10.0.0.1:2377" && token == "manager-join-token" {
|
||||
manager2JoinedHasManager = true
|
||||
return nil
|
||||
}
|
||||
assert.Fail(t, "Shouldn't have reached here.")
|
||||
return nil
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
if ip == "10.0.0.3" {
|
||||
return &mockDocker{
|
||||
swarmInit: func() (*docker.SwarmTokens, error) {
|
||||
assert.Fail(t, "Shouldn't have reached here.")
|
||||
return nil, nil
|
||||
},
|
||||
swarmJoin: func(addr, token string) error {
|
||||
if addr == "10.0.0.1:2377" && token == "manager-join-token" {
|
||||
manager3JoinedHasManager = true
|
||||
return nil
|
||||
}
|
||||
assert.Fail(t, "Shouldn't have reached here.")
|
||||
return nil
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
if ip == "10.0.0.4" {
|
||||
return &mockDocker{
|
||||
swarmInit: func() (*docker.SwarmTokens, error) {
|
||||
assert.Fail(t, "Shouldn't have reached here.")
|
||||
return nil, nil
|
||||
},
|
||||
swarmJoin: func(addr, token string) error {
|
||||
if addr == "10.0.0.1:2377" && token == "worker-join-token" {
|
||||
worker1JoinedHasWorker = true
|
||||
return nil
|
||||
}
|
||||
assert.Fail(t, "Shouldn't have reached here.")
|
||||
return nil
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
assert.Fail(t, "Shouldn't have reached here.")
|
||||
return nil, nil
|
||||
}
|
||||
sp := &mockSessionProvider{docker: dock}
|
||||
tasks := &mockTasks{}
|
||||
ev := event.NewLocalBroker()
|
||||
storage := &mockStorage{}
|
||||
_g.On("NewId").Return("aaaabbbbcccc")
|
||||
_f.On("GetForSession", "aaaabbbbcccc").Return(_d, nil)
|
||||
_d.On("CreateNetwork", "aaaabbbbcccc").Return(nil)
|
||||
_d.On("ConnectNetwork", config.L2ContainerName, "aaaabbbbcccc", "").Return("10.0.0.1", nil)
|
||||
_s.On("SessionPut", mock.AnythingOfType("*types.Session")).Return(nil)
|
||||
_s.On("InstanceCreate", "aaaabbbbcccc", mock.AnythingOfType("*types.Instance")).Return(nil)
|
||||
_s.On("SessionCount").Return(1, nil)
|
||||
_s.On("InstanceCount").Return(0, nil)
|
||||
|
||||
p := NewPWD(sp, tasks, ev, storage)
|
||||
_d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_manager1", Hostname: "manager1", Privileged: true}).Return("10.0.0.2", nil)
|
||||
_f.On("GetForInstance", "aaaabbbbcccc", "aaaabbbb_manager1").Return(_d, nil)
|
||||
_d.On("SwarmInit").Return(&docker.SwarmTokens{Manager: "managerToken", Worker: "workerToken"}, nil)
|
||||
_e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_manager1", "10.0.0.2", "manager1"}).Return()
|
||||
|
||||
_d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_manager2", Hostname: "manager2", Privileged: true}).Return("10.0.0.3", nil)
|
||||
_f.On("GetForInstance", "aaaabbbbcccc", "aaaabbbb_manager2").Return(_d, nil)
|
||||
_d.On("SwarmJoin", "10.0.0.2:2377", "managerToken").Return(nil)
|
||||
_e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_manager2", "10.0.0.3", "manager2"}).Return()
|
||||
|
||||
_d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind:overlay2-dev", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_manager3", Hostname: "manager3", Privileged: true}).Return("10.0.0.4", nil)
|
||||
_f.On("GetForInstance", "aaaabbbbcccc", "aaaabbbb_manager3").Return(_d, nil)
|
||||
_d.On("SwarmJoin", "10.0.0.2:2377", "managerToken").Return(nil)
|
||||
_e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_manager3", "10.0.0.4", "manager3"}).Return()
|
||||
|
||||
_d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_worker1", Hostname: "worker1", Privileged: true}).Return("10.0.0.5", nil)
|
||||
_f.On("GetForInstance", "aaaabbbbcccc", "aaaabbbb_worker1").Return(_d, nil)
|
||||
_d.On("SwarmJoin", "10.0.0.2:2377", "workerToken").Return(nil)
|
||||
_e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_worker1", "10.0.0.5", "worker1"}).Return()
|
||||
|
||||
_d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_other", Hostname: "other", Privileged: true}).Return("10.0.0.6", nil)
|
||||
_e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_other", "10.0.0.6", "other"}).Return()
|
||||
|
||||
var nilArgs []interface{}
|
||||
_e.M.On("Emit", event.SESSION_NEW, "aaaabbbbcccc", nilArgs).Return()
|
||||
|
||||
p := NewPWD(_f, _e, _s)
|
||||
p.generator = _g
|
||||
s, e := p.SessionNew(time.Hour, "", "", "")
|
||||
assert.Nil(t, e)
|
||||
|
||||
@@ -205,101 +140,9 @@ func TestSessionSetup(t *testing.T) {
|
||||
|
||||
assert.Equal(t, 5, len(s.Instances))
|
||||
|
||||
manager1 := fmt.Sprintf("%s_manager1", s.Id[:8])
|
||||
manager1Received := *s.Instances[manager1]
|
||||
assert.Equal(t, types.Instance{
|
||||
Name: manager1,
|
||||
Image: "franela/dind",
|
||||
Hostname: "manager1",
|
||||
IP: "10.0.0.1",
|
||||
SessionId: s.Id,
|
||||
Alias: "",
|
||||
IsDockerHost: true,
|
||||
Session: s,
|
||||
Docker: manager1Received.Docker,
|
||||
Proxy: manager1Received.Proxy,
|
||||
}, manager1Received)
|
||||
|
||||
manager2 := fmt.Sprintf("%s_manager2", s.Id[:8])
|
||||
manager2Received := *s.Instances[manager2]
|
||||
assert.Equal(t, types.Instance{
|
||||
Name: manager2,
|
||||
Image: "franela/dind",
|
||||
Hostname: "manager2",
|
||||
IP: "10.0.0.2",
|
||||
Alias: "",
|
||||
IsDockerHost: true,
|
||||
SessionId: s.Id,
|
||||
Session: s,
|
||||
Docker: manager2Received.Docker,
|
||||
Proxy: manager2Received.Proxy,
|
||||
}, manager2Received)
|
||||
|
||||
manager3 := fmt.Sprintf("%s_manager3", s.Id[:8])
|
||||
manager3Received := *s.Instances[manager3]
|
||||
assert.Equal(t, types.Instance{
|
||||
Name: manager3,
|
||||
Image: "franela/dind:overlay2-dev",
|
||||
Hostname: "manager3",
|
||||
IP: "10.0.0.3",
|
||||
Alias: "",
|
||||
SessionId: s.Id,
|
||||
IsDockerHost: true,
|
||||
Session: s,
|
||||
Docker: manager3Received.Docker,
|
||||
Proxy: manager3Received.Proxy,
|
||||
}, manager3Received)
|
||||
|
||||
worker1 := fmt.Sprintf("%s_worker1", s.Id[:8])
|
||||
worker1Received := *s.Instances[worker1]
|
||||
assert.Equal(t, types.Instance{
|
||||
Name: worker1,
|
||||
Image: "franela/dind",
|
||||
Hostname: "worker1",
|
||||
IP: "10.0.0.4",
|
||||
Alias: "",
|
||||
SessionId: s.Id,
|
||||
IsDockerHost: true,
|
||||
Session: s,
|
||||
Docker: worker1Received.Docker,
|
||||
Proxy: worker1Received.Proxy,
|
||||
}, worker1Received)
|
||||
|
||||
other := fmt.Sprintf("%s_other", s.Id[:8])
|
||||
otherReceived := *s.Instances[other]
|
||||
assert.Equal(t, types.Instance{
|
||||
Name: other,
|
||||
Image: "franela/dind",
|
||||
Hostname: "other",
|
||||
IP: "10.0.0.5",
|
||||
Alias: "",
|
||||
SessionId: s.Id,
|
||||
IsDockerHost: true,
|
||||
Session: s,
|
||||
Docker: otherReceived.Docker,
|
||||
Proxy: otherReceived.Proxy,
|
||||
}, otherReceived)
|
||||
|
||||
assert.True(t, swarmInitOnMaster1)
|
||||
assert.True(t, manager2JoinedHasManager)
|
||||
assert.True(t, manager3JoinedHasManager)
|
||||
assert.True(t, worker1JoinedHasWorker)
|
||||
}
|
||||
|
||||
func TestSessionPrepareOnce(t *testing.T) {
|
||||
dock := &mockDocker{}
|
||||
tasks := &mockTasks{}
|
||||
ev := event.NewLocalBroker()
|
||||
storage := &mockStorage{}
|
||||
sp := &mockSessionProvider{docker: dock}
|
||||
|
||||
p := NewPWD(sp, tasks, ev, storage)
|
||||
session := &types.Session{Id: "1234"}
|
||||
prepared, err := p.prepareSession(session)
|
||||
assert.True(t, preparedSessions[session.Id])
|
||||
assert.True(t, prepared)
|
||||
|
||||
prepared, err = p.prepareSession(session)
|
||||
assert.Nil(t, err)
|
||||
assert.False(t, prepared)
|
||||
_d.AssertExpectations(t)
|
||||
_f.AssertExpectations(t)
|
||||
_s.AssertExpectations(t)
|
||||
_g.AssertExpectations(t)
|
||||
_e.M.AssertExpectations(t)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user