docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the build 

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2016-01-18 11:06:03 +01:00
parent b71873ad2d
commit 19ec3e6d50
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
commands/provision_test.go
View File

@ -11,7 +11,6 @@ import (
"github.com/docker/machine/libmachine/host"
"github.com/docker/machine/libmachine/libmachinetest"
"github.com/docker/machine/libmachine/provision"
"github.com/docker/machine/libmachine/provision/provisiontest"
"github.com/docker/machine/libmachine/swarm"
"github.com/stretchr/testify/assert"
)
@ -52,14 +51,14 @@ func TestCmdProvision(t *testing.T) {
},
}
provision.SetDetector(&provisiontest.FakeDetector{
Provisioner: provisiontest.NewFakeProvisioner(nil),
provision.SetDetector(&provision.FakeDetector{
Provisioner: provision.NewFakeProvisioner(nil),
})
// fakeprovisioner always returns "true" for compatible host, so we
// just need to register it.
provision.Register("fakeprovisioner", &provision.RegisteredProvisioner{
New: provisiontest.NewFakeProvisioner,
New: provision.NewFakeProvisioner,
})
for _, tc := range testCases {

15
libmachine/provision/provisiontest/fake_provisioner.go → libmachine/provision/fake_provisioner.go
View File

@ -1,26 +1,25 @@
package provisiontest
package provision
import (
"github.com/docker/machine/libmachine/auth"
"github.com/docker/machine/libmachine/drivers"
"github.com/docker/machine/libmachine/engine"
"github.com/docker/machine/libmachine/provision"
"github.com/docker/machine/libmachine/provision/pkgaction"
"github.com/docker/machine/libmachine/provision/serviceaction"
"github.com/docker/machine/libmachine/swarm"
)
type FakeDetector struct {
provision.Provisioner
Provisioner
}
func (fd *FakeDetector) DetectProvisioner(d drivers.Driver) (provision.Provisioner, error) {
func (fd *FakeDetector) DetectProvisioner(d drivers.Driver) (Provisioner, error) {
return fd.Provisioner, nil
}
type FakeProvisioner struct{}
func NewFakeProvisioner(d drivers.Driver) provision.Provisioner {
func NewFakeProvisioner(d drivers.Driver) Provisioner {
return &FakeProvisioner{}
}
@ -32,7 +31,7 @@ func (fp *FakeProvisioner) String() string {
return "fakeprovisioner"
}
func (fp *FakeProvisioner) GenerateDockerOptions(dockerPort int) (*provision.DockerOptions, error) {
func (fp *FakeProvisioner) GenerateDockerOptions(dockerPort int) (*DockerOptions, error) {
return nil, nil
}
@ -72,8 +71,8 @@ func (fp *FakeProvisioner) GetDriver() drivers.Driver {
return nil
}
func (fp *FakeProvisioner) SetOsReleaseInfo(info *provision.OsRelease) {}
func (fp *FakeProvisioner) SetOsReleaseInfo(info *OsRelease) {}
func (fp *FakeProvisioner) GetOsReleaseInfo() (*provision.OsRelease, error) {
func (fp *FakeProvisioner) GetOsReleaseInfo() (*OsRelease, error) {
return nil, nil
}