builder/vmware: mirror virtualbox output dir changes

builder/vmware/common/output_config.go

@@ -2,7 +2,6 @@ package common
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/mitchellh/packer/common"
 	"github.com/mitchellh/packer/template/interpolate"
@@ -17,13 +16,5 @@ func (c *OutputConfig) Prepare(ctx *interpolate.Context, pc *common.PackerConfig
 		c.OutputDir = fmt.Sprintf("output-%s", pc.PackerBuildName)
 	}
 
-	var errs []error
-	if !pc.PackerForce {
-		if _, err := os.Stat(c.OutputDir); err == nil {
-			errs = append(errs, fmt.Errorf(
-				"Output directory '%s' already exists. It must not exist.", c.OutputDir))
-		}
-	}
-
-	return errs
+	return nil
 }

builder/vmware/common/output_config_test.go

 package common
 
 import (
-	"github.com/mitchellh/packer/common"
-	"io/ioutil"
-	"os"
 	"testing"
+
+	"github.com/mitchellh/packer/common"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
@@ -23,43 +22,3 @@ func TestOutputConfigPrepare(t *testing.T) {
 		t.Fatal("should have output dir")
 	}
 }
-
-func TestOutputConfigPrepare_exists(t *testing.T) {
-	td, err := ioutil.TempDir("", "packer")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	defer os.RemoveAll(td)
-
-	c := new(OutputConfig)
-	c.OutputDir = td
-
-	pc := &common.PackerConfig{
-		PackerBuildName: "foo",
-		PackerForce:     false,
-	}
-	errs := c.Prepare(testConfigTemplate(t), pc)
-	if len(errs) == 0 {
-		t.Fatal("should have errors")
-	}
-}
-
-func TestOutputConfigPrepare_forceExists(t *testing.T) {
-	td, err := ioutil.TempDir("", "packer")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	defer os.RemoveAll(td)
-
-	c := new(OutputConfig)
-	c.OutputDir = td
-
-	pc := &common.PackerConfig{
-		PackerBuildName: "foo",
-		PackerForce:     true,
-	}
-	errs := c.Prepare(testConfigTemplate(t), pc)
-	if len(errs) > 0 {
-		t.Fatal("should not have errors")
-	}
-}

builder/vmware/iso/builder_test.go

@@ -353,8 +353,8 @@ func TestBuilderPrepare_OutputDir(t *testing.T) {
 	if len(warns) > 0 {
 		t.Fatalf("bad: %#v", warns)
 	}
-	if err == nil {
-		t.Fatal("should have error")
+	if err != nil {
+		t.Fatalf("err: %s", err)
 	}
 
 	// Test with a good one