From ce99640fe229cc2e2824b4a0228f7a482eb2413c Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 17 Dec 2020 14:41:36 -0800 Subject: [PATCH] fix test fixture path --- builder/hyperv/iso/builder_test.go | 2 +- builder/hyperv/vmcx/builder_test.go | 2 +- builder/parallels/iso/builder_test.go | 2 +- builder/parallels/pvm/config_test.go | 2 +- builder/qemu/config_test.go | 2 +- builder/test-fixtures/floppies/bar.bat | 1 + builder/test-fixtures/floppies/foo.ps1 | 1 + builder/virtualbox/iso/builder_test.go | 2 +- builder/virtualbox/ovf/config_test.go | 2 +- builder/vmware/iso/builder_test.go | 2 +- builder/vmware/vmx/builder_test.go | 2 +- .../decompress-tar/outside_parent.tar | Bin 0 -> 10240 bytes post-processor/vagrant/virtualbox_test.go | 2 +- 13 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 builder/test-fixtures/floppies/bar.bat create mode 100644 builder/test-fixtures/floppies/foo.ps1 create mode 100644 post-processor/vagrant/test-fixtures/decompress-tar/outside_parent.tar diff --git a/builder/hyperv/iso/builder_test.go b/builder/hyperv/iso/builder_test.go index fa9f5e889..85484a97c 100644 --- a/builder/hyperv/iso/builder_test.go +++ b/builder/hyperv/iso/builder_test.go @@ -214,7 +214,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppiesPath := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppiesPath := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppiesPath), fmt.Sprintf("%s/foo.ps1", floppiesPath)} b = Builder{} _, warns, err = b.Prepare(config) diff --git a/builder/hyperv/vmcx/builder_test.go b/builder/hyperv/vmcx/builder_test.go index a26ebc40c..f663012d1 100644 --- a/builder/hyperv/vmcx/builder_test.go +++ b/builder/hyperv/vmcx/builder_test.go @@ -354,7 +354,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) diff --git a/builder/parallels/iso/builder_test.go b/builder/parallels/iso/builder_test.go index 3559421f7..5df4f702d 100644 --- a/builder/parallels/iso/builder_test.go +++ b/builder/parallels/iso/builder_test.go @@ -66,7 +66,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) diff --git a/builder/parallels/pvm/config_test.go b/builder/parallels/pvm/config_test.go index 0fb63cac2..0b7b5b0f0 100644 --- a/builder/parallels/pvm/config_test.go +++ b/builder/parallels/pvm/config_test.go @@ -74,7 +74,7 @@ func TestNewConfig_sourcePath(t *testing.T) { func TestNewConfig_FloppyFiles(t *testing.T) { c := testConfig(t) - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" c["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} _, err := (&Config{}).Prepare(c) if err != nil { diff --git a/builder/qemu/config_test.go b/builder/qemu/config_test.go index 7a7a65247..1f9969e10 100644 --- a/builder/qemu/config_test.go +++ b/builder/qemu/config_test.go @@ -328,7 +328,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", c.FloppyFiles) } - floppies_path := "../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} c = Config{} warns, err = c.Prepare(config) diff --git a/builder/test-fixtures/floppies/bar.bat b/builder/test-fixtures/floppies/bar.bat new file mode 100644 index 000000000..0d6a4f32d --- /dev/null +++ b/builder/test-fixtures/floppies/bar.bat @@ -0,0 +1 @@ +Echo I am a floppy with a batch file \ No newline at end of file diff --git a/builder/test-fixtures/floppies/foo.ps1 b/builder/test-fixtures/floppies/foo.ps1 new file mode 100644 index 000000000..672daeb89 --- /dev/null +++ b/builder/test-fixtures/floppies/foo.ps1 @@ -0,0 +1 @@ +Write-Host "I am a floppy with some Powershell" \ No newline at end of file diff --git a/builder/virtualbox/iso/builder_test.go b/builder/virtualbox/iso/builder_test.go index 41f25b711..f5be5225a 100644 --- a/builder/virtualbox/iso/builder_test.go +++ b/builder/virtualbox/iso/builder_test.go @@ -106,7 +106,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) diff --git a/builder/virtualbox/ovf/config_test.go b/builder/virtualbox/ovf/config_test.go index b0bafeb1f..18d134259 100644 --- a/builder/virtualbox/ovf/config_test.go +++ b/builder/virtualbox/ovf/config_test.go @@ -32,7 +32,7 @@ func getTempFile(t *testing.T) *os.File { func TestNewConfig_FloppyFiles(t *testing.T) { cfg := testConfig(t) - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" cfg["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} var c Config _, err := c.Prepare(cfg) diff --git a/builder/vmware/iso/builder_test.go b/builder/vmware/iso/builder_test.go index 63d3c088d..cf0205ca0 100644 --- a/builder/vmware/iso/builder_test.go +++ b/builder/vmware/iso/builder_test.go @@ -107,7 +107,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) diff --git a/builder/vmware/vmx/builder_test.go b/builder/vmware/vmx/builder_test.go index 3c302051b..55b57b453 100644 --- a/builder/vmware/vmx/builder_test.go +++ b/builder/vmware/vmx/builder_test.go @@ -36,7 +36,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) diff --git a/post-processor/vagrant/test-fixtures/decompress-tar/outside_parent.tar b/post-processor/vagrant/test-fixtures/decompress-tar/outside_parent.tar new file mode 100644 index 0000000000000000000000000000000000000000..f08df1e6560b1137d6103ab0968518339bb3566c GIT binary patch literal 10240 zcmeIxOAdlC5P;#XIYo_oC@t12cmvnSBanbKg7>#*OppZ|Bq8RX&9t;>r(c*bjPjy& z;mu`Ytx!I!QewzQdw6A~lXo6I8Y5z(4^|s(wG}E({6-