Specify OS in make test, minor fixes

Makefile

@@ -3,21 +3,23 @@
 PACKAGES = `go list ./... | grep -v vendor/`
 SSH_PORT = 22
 UBUNTU_VERSION = 16.04
+VPS_OS = ubuntu
 
 all: inertia
 
 inertia:
 	go build
 
 test:
-	make testenv-ubuntu VERSION=$(UBUNTU_VERSION)
+	make testenv-$(VPS_OS) VERSION=$(UBUNTU_VERSION)
 	go test $(PACKAGES) --cover
 
 test-verbose:
-	make testenv-ubuntu VERSION=$(UBUNTU_VERSION)	
+	make testenv-$(VPS_OS) VERSION=$(UBUNTU_VERSION)	
 	go test $(PACKAGES) -v --cover
 
 testenv-ubuntu:
+	docker stop testenv || true && docker rm rabbitmq || true
 	docker build -f ./test_env/Dockerfile.ubuntu \
 		-t ubuntuvps \
 		--build-arg VERSION=$(UBUNTU_VERSION) \

README.md

@@ -136,7 +136,8 @@ result, _ := remote.RunSSHCommand(string(shellScriptData))
 ### Testing
 
 ```bash
-make test
+make test                                     # test ubuntu:16.04
+make test VPS_OS=ubuntu UBUNTU_VERSION=latest # test ubuntu:latest
 ```
 
 ## Motivation

client/remote.go

@@ -253,11 +253,7 @@ func AddNewRemote(name, IP, sshPort, user, pemLoc, port string) error {
 	}
 
 	_, err = config.Write()
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
 
 // Stubbed out for testing.

client/remote_test.go

@@ -119,5 +119,4 @@ func TestInstrumentedBootstrap(t *testing.T) {
 	var writer bytes.Buffer
 	err := remote.Bootstrap(session, "testvps", &Config{Writer: &writer})
 	assert.Nil(t, err)
-	// TODO: Check if success
 }

cmd/remote.go

@@ -209,5 +209,5 @@ func init() {
 	// is called directly, e.g.:
 	remoteCmd.Flags().BoolP("verbose", "v", false, "Verbose output")
 	addCmd.Flags().StringP("port", "p", daemon.DefaultPort, "Daemon port")
-	addCmd.Flags().StringP("sshPort", "ssh", "22", "SSH port")
+	addCmd.Flags().StringP("sshPort", "s", "22", "SSH port")
 }