diff options
author | Duncan Mac-Vicar P <dmacvicar@suse.de> | 2017-11-10 13:30:08 +0100 |
---|---|---|
committer | Duncan Mac-Vicar P <dmacvicar@suse.de> | 2017-11-10 13:30:08 +0100 |
commit | cadeededae5d4bab34dcf9010a07810a298caf97 (patch) | |
tree | 6d79908f148aa8a802bd971497d01e3bddebdea4 | |
parent | b03e4140f8d1cb4f06fd4e56aadf18aafb0bde6f (diff) | |
download | terraform-provider-libvirt-cadeededae5d4bab34dcf9010a07810a298caf97.tar terraform-provider-libvirt-cadeededae5d4bab34dcf9010a07810a298caf97.tar.gz |
Fix libvirt ovmf firmware integration test on non-Ubuntu
On SUSE systems, these paths are different.
In order to reuse the code that looks for the right files, we
make the template and no-template case sub-tests of the main test
containing the lookup code.
Also, if the files are not there, skip the test.
-rw-r--r-- | libvirt/resource_libvirt_domain_test.go | 46 |
1 files changed, 36 insertions, 10 deletions
diff --git a/libvirt/resource_libvirt_domain_test.go b/libvirt/resource_libvirt_domain_test.go index 472eddae..da4c3023 100644 --- a/libvirt/resource_libvirt_domain_test.go +++ b/libvirt/resource_libvirt_domain_test.go @@ -5,6 +5,7 @@ import ( "fmt" "io/ioutil" "log" + "os" "testing" "github.com/hashicorp/terraform/helper/resource" @@ -607,21 +608,46 @@ func createNvramFile() (string, error) { return file.Name(), nil } -func TestAccLibvirtDomain_FirmwareNoTemplate(t *testing.T) { +func TestAccLibvirtDomain_Firmware(t *testing.T) { nvram_path, err := createNvramFile() if err != nil { t.Fatal(err) } + firmware := fmt.Sprintf("/usr/share/qemu/ovmf-x86_64.bin") + if _, err := os.Stat(firmware); os.IsNotExist(err) { + firmware = "/usr/share/ovmf/OVMF.fd" + if _, err := os.Stat(firmware); os.IsNotExist(err) { + t.Skip("Can't test domain custom firmware: OVMF firmware not found: %s") + } + } + + template := fmt.Sprintf("/usr/share/qemu/ovmf-x86_64-vars.bin") + if _, err := os.Stat(template); os.IsNotExist(err) { + template = "/usr/share/qemu/OVMF.fd" + if _, err := os.Stat(template); os.IsNotExist(err) { + t.Skip("Can't test domain custom firmware template: OVMF template not found: %s") + } + } + + t.Run("No Template", func(t *testing.T) { + subtestAccLibvirtDomain_FirmwareNoTemplate(t, nvram_path, firmware) + }) + t.Run("With Template", func(t *testing.T) { + subtestAccLibvirtDomain_FirmwareTemplate(t, nvram_path, firmware, template) + }) +} + +func subtestAccLibvirtDomain_FirmwareNoTemplate(t *testing.T, nvram_path string, firmware string) { var domain libvirt.Domain var config = fmt.Sprintf(` resource "libvirt_domain" "acceptance-test-domain" { name = "terraform-test-firmware-no-template" - firmware = "/usr/share/ovmf/OVMF.fd" + firmware = "%s" nvram { file = "%s" } - }`, nvram_path) + }`, firmware, nvram_path) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -637,14 +663,14 @@ func TestAccLibvirtDomain_FirmwareNoTemplate(t *testing.T) { resource.TestCheckResourceAttr( "libvirt_domain.acceptance-test-domain", "nvram.file", nvram_path), resource.TestCheckResourceAttr( - "libvirt_domain.acceptance-test-domain", "firmware", "/usr/share/ovmf/OVMF.fd"), + "libvirt_domain.acceptance-test-domain", "firmware", firmware), ), }, }, }) } -func TestAccLibvirtDomain_FirmwareTemplate(t *testing.T) { +func subtestAccLibvirtDomain_FirmwareTemplate(t *testing.T, nvram_path string, firmware string, template string) { nvram_path, err := createNvramFile() if err != nil { t.Fatal(err) @@ -654,12 +680,12 @@ func TestAccLibvirtDomain_FirmwareTemplate(t *testing.T) { var config = fmt.Sprintf(` resource "libvirt_domain" "acceptance-test-domain" { name = "terraform-test-firmware-with-template" - firmware = "/usr/share/ovmf/OVMF.fd" + firmware = "%s" nvram { file = "%s" - template = "/usr/share/qemu/OVMF.fd" + template = "%s" } - }`, nvram_path) + }`, firmware, nvram_path, template) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -675,9 +701,9 @@ func TestAccLibvirtDomain_FirmwareTemplate(t *testing.T) { resource.TestCheckResourceAttr( "libvirt_domain.acceptance-test-domain", "nvram.file", nvram_path), resource.TestCheckResourceAttr( - "libvirt_domain.acceptance-test-domain", "nvram.template", "/usr/share/qemu/OVMF.fd"), + "libvirt_domain.acceptance-test-domain", "nvram.template", template), resource.TestCheckResourceAttr( - "libvirt_domain.acceptance-test-domain", "firmware", "/usr/share/ovmf/OVMF.fd"), + "libvirt_domain.acceptance-test-domain", "firmware", firmware), ), }, }, |