Merge pull request #2770 from bacongobbler/hookup-deisctl-tests

Hookup deisctl tests

Author: Matthew Fisher

Makefile

@@ -67,10 +67,14 @@ release: check-registry
 
 deploy: build dev-release restart
 
-test: test-components push test-integration
+test: test-unit test-functional push test-integration
 
-test-components:
-	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) test &&) echo done
+test-functional:
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) test-functional &&) echo done
+
+test-unit:
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) test-unit &&) echo done
+	@$(foreach C, $(CLIENTS), $(MAKE) -C $(C) test-unit &&) echo done
 
 test-integration:
 	$(MAKE) -C tests/ test-full

client/Makefile

@@ -36,3 +36,6 @@ setup-venv:
 
 test-style: setup-venv
 	venv/bin/flake8
+
+test-unit:
+	@echo no unit tests

deisctl/Makefile

@@ -36,5 +36,7 @@ test-style:
 	go vet ./...
 	-golint ./...
 
-test: test-style
+test-unit:
 	godep go test -v -cover ./...
+
+test: test-style test-unit

deisctl/backend/fleet/ssh.go

@@ -17,7 +17,7 @@ import (
 func runCommand(cmd string, machID string) (retcode int) {
 	var err error
 	if machine.IsLocalMachineID(machID) {
-		err, retcode = runLocalCommand(cmd)
+		retcode, err = runLocalCommand(cmd)
 		if err != nil {
 			fmt.Printf("Error running local command: %v\n", err)
 		}
@@ -27,7 +27,7 @@ func runCommand(cmd string, machID string) (retcode int) {
 			fmt.Printf("Error getting machine IP: %v\n", err)
 		} else {
 			sshTimeout := time.Duration(Flags.SSHTimeout*1000) * time.Millisecond
-			err, retcode = runRemoteCommand(cmd, ms.PublicIP, sshTimeout)
+			retcode, err = runRemoteCommand(cmd, ms.PublicIP, sshTimeout)
 			if err != nil {
 				fmt.Printf("Error running remote command: %v\n", err)
 			}
@@ -37,7 +37,7 @@ func runCommand(cmd string, machID string) (retcode int) {
 }
 
 // runLocalCommand runs the given command locally and returns any error encountered and the exit code of the command
-func runLocalCommand(cmd string) (error, int) {
+func runLocalCommand(cmd string) (int, error) {
 	cmdSlice := strings.Split(cmd, " ")
 	osCmd := exec.Command(cmdSlice[0], cmdSlice[1:]...)
 	osCmd.Stderr = os.Stderr
@@ -48,31 +48,32 @@ func runLocalCommand(cmd string) (error, int) {
 		// Get the command's exit status if we can
 		if exiterr, ok := err.(*exec.ExitError); ok {
 			if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
-				return nil, status.ExitStatus()
+				return status.ExitStatus(), nil
 			}
 		}
 		// Otherwise, generic command error
-		return err, -1
+		return -1, err
 	}
-	return nil, 0
+	return 0, nil
 }
 
 // runRemoteCommand runs the given command over SSH on the given IP, and returns
 // any error encountered and the exit status of the command
-func runRemoteCommand(cmd string, addr string, timeout time.Duration) (err error, exit int) {
+func runRemoteCommand(cmd string, addr string, timeout time.Duration) (exit int, err error) {
 	var sshClient *ssh.SSHForwardingClient
 	if tun := getTunnelFlag(); tun != "" {
 		sshClient, err = ssh.NewTunnelledSSHClient("core", tun, addr, getChecker(), false, timeout)
 	} else {
 		sshClient, err = ssh.NewSSHClient("core", addr, getChecker(), false, timeout)
 	}
 	if err != nil {
-		return err, -1
+		return -1, err
 	}
 
 	defer sshClient.Close()
 
-	return ssh.Execute(sshClient, cmd)
+	err, exit = ssh.Execute(sshClient, cmd)
+	return 
 }
 
 func machineState(machID string) (*machine.MachineState, error) {

deisctl/deisctl.go

@@ -63,9 +63,8 @@ Options:
 		if helpFlag {
 			fmt.Print(usage)
 			return 0
-		} else {
-			return 1
 		}
+		return 1
 	}
 	command := args["<command>"]
 	setTunnel := true
@@ -181,7 +180,7 @@ func parseArgs(argv []string) ([]string, bool) {
 // removeGlobalArgs returns the given args without any global option flags, to make
 // re-parsing by subcommands easier.
 func removeGlobalArgs(argv []string) []string {
-	v := make([]string, 0)
+	var v []string
 	for _, a := range argv {
 		if !isGlobalArg(a) {
 			v = append(v, a)

deisctl/deisctl_test.go

@@ -35,7 +35,7 @@ func TestHelp(t *testing.T) {
 	out := ""
 	for _, args := range allArgs {
 		out = commandOutput(args)
-		if !strings.Contains(out, "Usage: deisctl <command> [<args>...] [options]") ||
+		if !strings.Contains(out, "Usage: deisctl [options] <command> [<args>...]") ||
 			!strings.Contains(out, "Commands, use \"deisctl help <command>\" to learn more") {
 			t.Error(out)
 		}
@@ -45,7 +45,7 @@ func TestHelp(t *testing.T) {
 // TestUsage ensures that deisctl prints a short usage string when no arguments were provided.
 func TestUsage(t *testing.T) {
 	out := commandOutput(nil)
-	if out != "Usage: deisctl <command> [<args>...] [options]\n" {
+	if out != "Usage: deisctl [options] <command> [<args>...]\n" {
 		t.Error(out)
 	}
 }

publisher/Makefile

@@ -49,6 +49,9 @@ stop: check-deisctl
 
 test: test-unit
 
+test-functional:
+	@echo no functional tests
+
 test-unit:
 	godep go test -v ./...
 

tests/bin/test-acceptance.sh

@@ -22,6 +22,10 @@ log_phase "Running documentation tests"
 # test building documentation
 make -C docs/ test
 
+log_phase "Running unit tests"
+
+make test-unit
+
 log_phase "Building from current source tree"
 
 # build all docker images and client binaries
@@ -30,9 +34,9 @@ make build
 # use the built client binaries
 export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
 
-log_phase "Running unit and functional tests"
+log_phase "Running functional tests"
 
-make test-components
+make test-functional
 
 log_phase "Provisioning 3-node CoreOS"
 

tests/bin/test-integration.sh

@@ -22,6 +22,10 @@ log_phase "Running documentation tests"
 # test building documentation
 make -C docs/ test
 
+log_phase "Running unit tests"
+
+make test-unit
+
 log_phase "Building from current source tree"
 
 # build all docker images and client binaries
@@ -30,9 +34,9 @@ make build
 # use the built client binaries
 export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
 
-log_phase "Running unit and functional tests"
+log_phase "Running functional tests"
 
-make test-components
+make test-functional
 
 log_phase "Provisioning 3-node CoreOS"
 

tests/bin/test-smoke.sh

@@ -22,6 +22,10 @@ log_phase "Running documentation tests"
 # test building documentation
 make -C docs/ test
 
+log_phase "Running unit tests"
+
+make test-unit
+
 log_phase "Building from current source tree"
 
 # build all docker images and client binaries
@@ -30,9 +34,9 @@ make build
 # use the built client binaries
 export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
 
-log_phase "Running unit and functional tests"
+log_phase "Running functional tests"
 
-make test-components
+make test-functional
 
 log_phase "Provisioning 3-node CoreOS"