Remove unused code

dgageot · dgageot · commit 8bbfc6ef2acf · 2015-11-13T16:27:50.000+01:00
Signed-off-by: David Gageot &lt;david@gageot.net&gt;
diff --git a/commands/commands.go b/commands/commands.go
@@ -156,20 +156,8 @@ func getFirstArgHost(c CommandLine) (*host.Host, error) {
 	store := getStore(c)
 	hostName := c.Args().First()
 
-	exists, err := store.Exists(hostName)
-	if err != nil {
-		return nil, fmt.Errorf("Error checking if host %q exists: %s", hostName, err)
-	}
-	if !exists {
-		return nil, fmt.Errorf("Host %q does not exist", hostName)
-	}
-
 	h, err := loadHost(store, hostName)
 	if err != nil {
-		// I guess I feel OK with bailing here since if we can't get
-		// the host reliably we're definitely not going to be able to
-		// do anything else interesting, but also this premature exit
-		// feels wrong to me.  Let's revisit it later.
 		return nil, fmt.Errorf("Error trying to get host %q: %s", hostName, err)
 	}
 
diff --git a/commands/commands_test.go b/commands/commands_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/docker/machine/drivers/fakedriver"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/hosttest"
-	"github.com/docker/machine/libmachine/persisttest"
 	"github.com/docker/machine/libmachine/state"
 	"github.com/stretchr/testify/assert"
 )
@@ -104,7 +103,7 @@ func TestRunActionForeachMachine(t *testing.T) {
 }
 
 func TestPrintIPEmptyGivenLocalEngine(t *testing.T) {
-	defer persisttest.Cleanup()
+	defer cleanup()
 	host, _ := hosttest.GetDefaultTestHost()
 
 	out, w := captureStdout()
diff --git a/libmachine/hosttest/default_test_host.go b/libmachine/hosttest/default_test_host.go
@@ -11,7 +11,6 @@ import (
 
 const (
 	DefaultHostName    = "test-host"
-	HostTestDriverName = "none"
 	HostTestCaCert     = "test-cert"
 	HostTestPrivateKey = "test-key"
 )
diff --git a/libmachine/mcnerror/errors.go b/libmachine/mcnerror/errors.go
@@ -6,8 +6,7 @@ import (
 )
 
 var (
-	ErrInvalidHostname     = errors.New("Invalid hostname specified. Allowed hostname chars are: 0-9a-zA-Z . -")
-	ErrUnknownProviderType = errors.New("Unknown hypervisor type")
+	ErrInvalidHostname = errors.New("Invalid hostname specified. Allowed hostname chars are: 0-9a-zA-Z . -")
 )
 
 type ErrHostDoesNotExist struct {
diff --git a/libmachine/persisttest/default_test_store.go b/libmachine/persisttest/default_test_store.go

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"github.com/docker/machine/drivers/fakedriver"`
`9`	`9`	`"github.com/docker/machine/libmachine/host"`
`10`	`10`	`"github.com/docker/machine/libmachine/hosttest"`
`11`		`- "github.com/docker/machine/libmachine/persisttest"`
`12`	`11`	`"github.com/docker/machine/libmachine/state"`
`13`	`12`	`"github.com/stretchr/testify/assert"`
`14`	`13`	`)`
`@@ -104,7 +103,7 @@ func TestRunActionForeachMachine(t *testing.T) {`
`104`	`103`	`}`
`105`	`104`
`106`	`105`	`func TestPrintIPEmptyGivenLocalEngine(t *testing.T) {`
`107`		`- defer persisttest.Cleanup()`
	`106`	`+ defer cleanup()`
`108`	`107`	`host, _ := hosttest.GetDefaultTestHost()`
`109`	`108`
`110`	`109`	`out, w := captureStdout()`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ import (`
`11`	`11`
`12`	`12`	`const (`
`13`	`13`	`DefaultHostName = "test-host"`
`14`		`- HostTestDriverName = "none"`
`15`	`14`	`HostTestCaCert = "test-cert"`
`16`	`15`	`HostTestPrivateKey = "test-key"`
`17`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`var (`
`9`		`- ErrInvalidHostname = errors.New("Invalid hostname specified. Allowed hostname chars are: 0-9a-zA-Z . -")`
`10`		`- ErrUnknownProviderType = errors.New("Unknown hypervisor type")`
	`9`	`+ ErrInvalidHostname = errors.New("Invalid hostname specified. Allowed hostname chars are: 0-9a-zA-Z . -")`
`11`	`10`	`)`
`12`	`11`
`13`	`12`	`type ErrHostDoesNotExist struct {`