From 3c3c08a0cd24bd062631dd4178979d80a363a4e5 Mon Sep 17 00:00:00 2001 From: Gavin Williams Date: Sat, 27 May 2017 12:59:42 +0100 Subject: [PATCH] provider/openstack: Fix issue with providing OS_IMAGE_ID or OS_IMAGE_NAME when running acceptance tests. --- builtin/providers/openstack/provider_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/providers/openstack/provider_test.go b/builtin/providers/openstack/provider_test.go index 949621c56..767dcc8d9 100644 --- a/builtin/providers/openstack/provider_test.go +++ b/builtin/providers/openstack/provider_test.go @@ -39,8 +39,8 @@ func testAccPreCheck(t *testing.T) { t.Fatal("OS_AUTH_URL must be set for acceptance tests") } - if OS_IMAGE_ID == "" || OS_IMAGE_NAME == "" { - t.Fatal("OS_IMAGE_ID and OS_IMAGE_NAME must be set for acceptance tests") + if OS_IMAGE_ID == "" && OS_IMAGE_NAME == "" { + t.Fatal("OS_IMAGE_ID or OS_IMAGE_NAME must be set for acceptance tests") } if OS_POOL_NAME == "" {