From 144b94c251eecd903d65b55ccc5cf8fb71776739 Mon Sep 17 00:00:00 2001 From: Olivier Gambier Date: Mon, 21 Sep 2015 20:39:48 -0700 Subject: [PATCH 1/2] Fix error reporting on VBoxManage not found Signed-off-by: Olivier Gambier --- drivers/virtualbox/vbm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/virtualbox/vbm.go b/drivers/virtualbox/vbm.go index a6f9434adf..db26dbf6e3 100644 --- a/drivers/virtualbox/vbm.go +++ b/drivers/virtualbox/vbm.go @@ -78,7 +78,7 @@ func vbmOutErr(args ...string) (string, string, error) { log.Debugf("STDOUT: %v", stdout.String()) log.Debugf("STDERR: %v", stderrStr) if err != nil { - if ee, ok := err.(*exec.Error); ok && ee == exec.ErrNotFound { + if ee, ok := err.(*exec.Error); ok && ee.Err == exec.ErrNotFound { err = ErrVBMNotFound } } else { From de249c226924c497a0955ffdd7f13a00b1845def Mon Sep 17 00:00:00 2001 From: Olivier Gambier Date: Tue, 22 Sep 2015 12:57:24 -0700 Subject: [PATCH 2/2] Remove empty test files Signed-off-by: Olivier Gambier --- commands/active_test.go | 1 - commands/kill_test.go | 1 - version/version_test.go | 1 - 3 files changed, 3 deletions(-) delete mode 100644 commands/active_test.go delete mode 100644 commands/kill_test.go delete mode 100644 version/version_test.go diff --git a/commands/active_test.go b/commands/active_test.go deleted file mode 100644 index cdff10da75..0000000000 --- a/commands/active_test.go +++ /dev/null @@ -1 +0,0 @@ -package commands diff --git a/commands/kill_test.go b/commands/kill_test.go deleted file mode 100644 index cdff10da75..0000000000 --- a/commands/kill_test.go +++ /dev/null @@ -1 +0,0 @@ -package commands diff --git a/version/version_test.go b/version/version_test.go deleted file mode 100644 index f37d99d0c2..0000000000 --- a/version/version_test.go +++ /dev/null @@ -1 +0,0 @@ -package version