epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing pieces due to rebase

Browse Source
This commit is contained in:
Marcos Lilljedahl
2017-09-12 17:17:19 -03:00
parent 81d9d9c9b6
commit 6eacb85fc3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api.go
View File

@@ -22,7 +22,7 @@ func main() {
s := initStorage() s := initStorage()
f := initFactory(s) f := initFactory(s)
ipf := provisioner.NewInstanceProvisionerFactory(provisioner.NewWindows(f, s), provisioner.NewDinD(f, s)) ipf := provisioner.NewInstanceProvisionerFactory(provisioner.NewWindowsASG(f, s), provisioner.NewDinD(f, s))
sp := provisioner.NewOverlaySessionProvisioner(f) sp := provisioner.NewOverlaySessionProvisioner(f)
core := pwd.NewPWD(f, e, s, sp, ipf) core := pwd.NewPWD(f, e, s, sp, ipf)

2
provisioner/windows.go
View File

@@ -46,7 +46,7 @@ type instanceInfo struct {
id string id string
} }
func NewWindows(f docker.FactoryApi, st storage.StorageApi) *windows { func NewWindowsASG(f docker.FactoryApi, st storage.StorageApi) *windows {
return &windows{factory: f, storage: st} return &windows{factory: f, storage: st}
} }

3
pwd/session_test.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/play-with-docker/play-with-docker/docker" "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/event"
"github.com/play-with-docker/play-with-docker/provisioner" "github.com/play-with-docker/play-with-docker/provisioner"
"github.com/play-with-docker/play-with-docker/pwd/types"
"github.com/play-with-docker/play-with-docker/storage" "github.com/play-with-docker/play-with-docker/storage"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
@@ -75,6 +74,7 @@ func TestSessionNew(t *testing.T) {
************************** Not sure how to test this as it can pick any manager as the first node in the swarm cluster. ************************** Not sure how to test this as it can pick any manager as the first node in the swarm cluster.
func TestSessionSetup(t *testing.T) { func TestSessionSetup(t *testing.T) {
_d := &docker.Mock{} _d := &docker.Mock{}
_f := &docker.FactoryMock{} _f := &docker.FactoryMock{}
@@ -165,3 +165,4 @@ func TestSessionSetup(t *testing.T) {
_g.AssertExpectations(t) _g.AssertExpectations(t)
_e.M.AssertExpectations(t) _e.M.AssertExpectations(t)
} }
*/