From d52399a22d6ef23dd60a33c3ef8648320021433e Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Tue, 30 Dec 2014 15:11:24 -0500 Subject: [PATCH] fixes from @nathanleclaire Signed-off-by: Evan Hazlett --- _integration-test/machine_test.go | 12 ++++++------ commands.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_integration-test/machine_test.go b/_integration-test/machine_test.go index 3c4f8c68ff..35feb2cddc 100644 --- a/_integration-test/machine_test.go +++ b/_integration-test/machine_test.go @@ -8,11 +8,11 @@ import ( ) const ( - MACHINE_NAME = "machine-integration-test-%s" + machineName = "machine-integration-test-%s" ) func machineCreate(name string, t *testing.T, wg *sync.WaitGroup) { - mName := fmt.Sprintf(MACHINE_NAME, name) + mName := fmt.Sprintf(machineName, name) fmt.Printf(" - testing create for %s (%s)\n", name, mName) runCmd := exec.Command(machineBinary, "create", "-d", name, mName) out, exitCode, err := runCommandWithOutput(runCmd) @@ -26,7 +26,7 @@ func machineCreate(name string, t *testing.T, wg *sync.WaitGroup) { } func machineStop(name string, t *testing.T, wg *sync.WaitGroup) { - mName := fmt.Sprintf(MACHINE_NAME, name) + mName := fmt.Sprintf(machineName, name) fmt.Printf(" - testing stop for %s (%s)\n", name, mName) runCmd := exec.Command(machineBinary, "stop", mName) out, exitCode, err := runCommandWithOutput(runCmd) @@ -40,7 +40,7 @@ func machineStop(name string, t *testing.T, wg *sync.WaitGroup) { } func machineStart(name string, t *testing.T, wg *sync.WaitGroup) { - mName := fmt.Sprintf(MACHINE_NAME, name) + mName := fmt.Sprintf(machineName, name) fmt.Printf(" - testing start for %s (%s)\n", name, mName) runCmd := exec.Command(machineBinary, "start", mName) out, exitCode, err := runCommandWithOutput(runCmd) @@ -54,7 +54,7 @@ func machineStart(name string, t *testing.T, wg *sync.WaitGroup) { } func machineKill(name string, t *testing.T, wg *sync.WaitGroup) { - mName := fmt.Sprintf(MACHINE_NAME, name) + mName := fmt.Sprintf(machineName, name) fmt.Printf(" - testing kill for %s (%s)\n", name, mName) runCmd := exec.Command(machineBinary, "kill", mName) out, exitCode, err := runCommandWithOutput(runCmd) @@ -68,7 +68,7 @@ func machineKill(name string, t *testing.T, wg *sync.WaitGroup) { } func machineRm(name string, t *testing.T, wg *sync.WaitGroup) { - mName := fmt.Sprintf(MACHINE_NAME, name) + mName := fmt.Sprintf(machineName, name) fmt.Printf(" - testing rm for %s (%s)\n", name, mName) runCmd := exec.Command(machineBinary, "rm", "-f", mName) out, exitCode, err := runCommandWithOutput(runCmd) diff --git a/commands.go b/commands.go index 45611d2ea0..80a9dda55b 100644 --- a/commands.go +++ b/commands.go @@ -94,7 +94,7 @@ var Commands = []cli.Command{ if name == "" { cli.ShowCommandHelp(c, "create") - log.Fatalf("You must specify a machine name") + log.Fatal("You must specify a machine name") } keyExists, err := drivers.PublicKeyExists()