Skip to content

Commit 6c9b294

Browse files
MalloZupMalloZup
authored
Merge pull request #400 from MalloZup/volume-random
randomize volume resources in testacc
2 parents 7e52bbe + 9bf58b3 commit 6c9b294

File tree

1 file changed

+84
-93
lines changed

1 file changed

+84
-93
lines changed

‎libvirt/resource_libvirt_volume_test.go

Lines changed: 84 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"regexp"
88
"testing"
99

10+
"github.com/hashicorp/terraform/helper/acctest"
1011
"github.com/hashicorp/terraform/helper/resource"
1112
"github.com/hashicorp/terraform/terraform"
1213
libvirt "github.com/libvirt/libvirt-go"
@@ -126,26 +127,25 @@ func testAccCheckLibvirtVolumeIsBackingStore(name string, volume *libvirt.Storag
126127

127128
func TestAccLibvirtVolume_Basic(t *testing.T) {
128129
var volume libvirt.StorageVol
129-
130-
const testAccCheckLibvirtVolumeConfigBasic = `
131-
resource "libvirt_volume" "terraform-acceptance-test-1" {
132-
name = "terraform-test"
133-
size = 1073741824
134-
}`
130+
randomVolumeResource := acctest.RandString(10)
135131

136132
resource.Test(t, resource.TestCase{
137133
PreCheck: func() { testAccPreCheck(t) },
138134
Providers: testAccProviders,
139135
CheckDestroy: testAccCheckLibvirtVolumeDestroy,
140136
Steps: []resource.TestStep{
141137
{
142-
Config: testAccCheckLibvirtVolumeConfigBasic,
138+
Config: fmt.Sprintf(`
139+
resource "libvirt_volume" "%s" {
140+
name = "terraform-test"
141+
size = 1073741824
142+
}`, randomVolumeResource),
143143
Check: resource.ComposeTestCheckFunc(
144-
testAccCheckLibvirtVolumeExists("libvirt_volume.terraform-acceptance-test-1", &volume),
144+
testAccCheckLibvirtVolumeExists("libvirt_volume."+randomVolumeResource, &volume),
145145
resource.TestCheckResourceAttr(
146-
"libvirt_volume.terraform-acceptance-test-1", "name", "terraform-test"),
146+
"libvirt_volume."+randomVolumeResource, "name", "terraform-test"),
147147
resource.TestCheckResourceAttr(
148-
"libvirt_volume.terraform-acceptance-test-1", "size", "1073741824"),
148+
"libvirt_volume."+randomVolumeResource, "size", "1073741824"),
149149
),
150150
},
151151
},
@@ -155,26 +155,25 @@ func TestAccLibvirtVolume_Basic(t *testing.T) {
155155
func TestAccLibvirtVolume_BackingStoreTestByID(t *testing.T) {
156156
var volume libvirt.StorageVol
157157
var volume2 libvirt.StorageVol
158-
const testAccCheckLibvirtVolumeConfigBasic = `
159-
resource "libvirt_volume" "terraform-acceptance-test-3" {
160-
name = "terraform-test3"
161-
size = 1073741824
162-
}
163-
resource "libvirt_volume" "backing-store" {
164-
name = "backing-store"
165-
base_volume_id = "${libvirt_volume.terraform-acceptance-test-3.id}"
166-
}
167-
`
168-
158+
randomVolumeResource := acctest.RandString(10)
169159
resource.Test(t, resource.TestCase{
170160
PreCheck: func() { testAccPreCheck(t) },
171161
Providers: testAccProviders,
172162
CheckDestroy: testAccCheckLibvirtVolumeDestroy,
173163
Steps: []resource.TestStep{
174164
{
175-
Config: testAccCheckLibvirtVolumeConfigBasic,
165+
Config: fmt.Sprintf(`
166+
resource "libvirt_volume" "%s" {
167+
name = "terraform-test3"
168+
size = 1073741824
169+
}
170+
resource "libvirt_volume" "backing-store" {
171+
name = "backing-store"
172+
base_volume_id = "${libvirt_volume.%s.id}"
173+
}
174+
`, randomVolumeResource, randomVolumeResource),
176175
Check: resource.ComposeTestCheckFunc(
177-
testAccCheckLibvirtVolumeExists("libvirt_volume.terraform-acceptance-test-3", &volume),
176+
testAccCheckLibvirtVolumeExists("libvirt_volume."+randomVolumeResource, &volume),
178177
testAccCheckLibvirtVolumeIsBackingStore("libvirt_volume.backing-store", &volume2),
179178
),
180179
},
@@ -185,26 +184,24 @@ func TestAccLibvirtVolume_BackingStoreTestByID(t *testing.T) {
185184
func TestAccLibvirtVolume_BackingStoreTestByName(t *testing.T) {
186185
var volume libvirt.StorageVol
187186
var volume2 libvirt.StorageVol
188-
const testAccCheckLibvirtVolumeConfigBasic = `
189-
resource "libvirt_volume" "terraform-acceptance-test-3" {
190-
name = "terraform-test3"
191-
size = 1073741824
192-
}
193-
resource "libvirt_volume" "backing-store" {
194-
name = "backing-store"
195-
base_volume_name = "${libvirt_volume.terraform-acceptance-test-3.name}"
196-
}
197-
`
198-
187+
randomVolumeResource := acctest.RandString(10)
199188
resource.Test(t, resource.TestCase{
200189
PreCheck: func() { testAccPreCheck(t) },
201190
Providers: testAccProviders,
202191
CheckDestroy: testAccCheckLibvirtVolumeDestroy,
203192
Steps: []resource.TestStep{
204193
{
205-
Config: testAccCheckLibvirtVolumeConfigBasic,
194+
Config: fmt.Sprintf(`
195+
resource "libvirt_volume" "%s" {
196+
name = "terraform-test3"
197+
size = 1073741824
198+
}
199+
resource "libvirt_volume" "backing-store" {
200+
name = "backing-store"
201+
base_volume_name = "${libvirt_volume.%s.name}"
202+
} `, randomVolumeResource, randomVolumeResource),
206203
Check: resource.ComposeTestCheckFunc(
207-
testAccCheckLibvirtVolumeExists("libvirt_volume.terraform-acceptance-test-3", &volume),
204+
testAccCheckLibvirtVolumeExists("libvirt_volume."+randomVolumeResource, &volume),
208205
testAccCheckLibvirtVolumeIsBackingStore("libvirt_volume.backing-store", &volume2),
209206
),
210207
},
@@ -218,12 +215,12 @@ func TestAccLibvirtVolume_BackingStoreTestByName(t *testing.T) {
218215
// This test should fail without a proper "Exists" implementation
219216
func TestAccLibvirtVolume_ManuallyDestroyed(t *testing.T) {
220217
var volume libvirt.StorageVol
221-
222-
const testAccCheckLibvirtVolumeConfigBasic = `
223-
resource "libvirt_volume" "terraform-acceptance-test-1" {
218+
randomVolumeResource := acctest.RandString(10)
219+
testAccCheckLibvirtVolumeConfigBasic := fmt.Sprintf(`
220+
resource "libvirt_volume" "%s" {
224221
name = "terraform-test"
225222
size = 1073741824
226-
}`
223+
}`, randomVolumeResource)
227224

228225
resource.Test(t, resource.TestCase{
229226
PreCheck: func() { testAccPreCheck(t) },
@@ -233,7 +230,7 @@ func TestAccLibvirtVolume_ManuallyDestroyed(t *testing.T) {
233230
{
234231
Config: testAccCheckLibvirtVolumeConfigBasic,
235232
Check: resource.ComposeTestCheckFunc(
236-
testAccCheckLibvirtVolumeExists("libvirt_volume.terraform-acceptance-test-1", &volume),
233+
testAccCheckLibvirtVolumeExists("libvirt_volume."+randomVolumeResource, &volume),
237234
),
238235
},
239236
{
@@ -253,17 +250,19 @@ func TestAccLibvirtVolume_ManuallyDestroyed(t *testing.T) {
253250
}
254251

255252
func TestAccLibvirtVolume_UniqueName(t *testing.T) {
256-
const config = `
257-
resource "libvirt_volume" "terraform-acceptance-test-1" {
253+
randomVolumeName := acctest.RandString(10)
254+
randomVolumeName2 := acctest.RandString(10)
255+
config := fmt.Sprintf(`
256+
resource "libvirt_volume" "%s" {
258257
name = "terraform-test"
259258
size = 1073741824
260259
}
261260
262-
resource "libvirt_volume" "terraform-acceptance-test-2" {
261+
resource "libvirt_volume" "%s" {
263262
name = "terraform-test"
264263
size = 1073741824
265264
}
266-
`
265+
`, randomVolumeName, randomVolumeName2)
267266

268267
resource.Test(t, resource.TestCase{
269268
PreCheck: func() { testAccPreCheck(t) },
@@ -280,6 +279,7 @@ func TestAccLibvirtVolume_UniqueName(t *testing.T) {
280279

281280
func TestAccLibvirtVolume_DownloadFromSource(t *testing.T) {
282281
var volume libvirt.StorageVol
282+
randomVolumeName := acctest.RandString(10)
283283

284284
fws := fileWebServer{}
285285
if err := fws.Start(); err != nil {
@@ -293,13 +293,11 @@ func TestAccLibvirtVolume_DownloadFromSource(t *testing.T) {
293293
t.Fatal(err)
294294
}
295295

296-
const testAccCheckLibvirtVolumeConfigSource = `
297-
resource "libvirt_volume" "terraform-acceptance-test-2" {
296+
config := fmt.Sprintf(`
297+
resource "libvirt_volume" "%s" {
298298
name = "terraform-test"
299299
source = "%s"
300-
}`
301-
302-
config := fmt.Sprintf(testAccCheckLibvirtVolumeConfigSource, url)
300+
}`, randomVolumeName, url)
303301

304302
resource.Test(t, resource.TestCase{
305303
PreCheck: func() { testAccPreCheck(t) },
@@ -309,9 +307,9 @@ func TestAccLibvirtVolume_DownloadFromSource(t *testing.T) {
309307
{
310308
Config: config,
311309
Check: resource.ComposeTestCheckFunc(
312-
testAccCheckLibvirtVolumeExists("libvirt_volume.terraform-acceptance-test-2", &volume),
310+
testAccCheckLibvirtVolumeExists("libvirt_volume."+randomVolumeName, &volume),
313311
resource.TestCheckResourceAttr(
314-
"libvirt_volume.terraform-acceptance-test-2", "name", "terraform-test"),
312+
"libvirt_volume."+randomVolumeName, "name", "terraform-test"),
315313
),
316314
},
317315
},
@@ -321,7 +319,8 @@ func TestAccLibvirtVolume_DownloadFromSource(t *testing.T) {
321319
func TestAccLibvirtVolume_DownloadFromSourceFormat(t *testing.T) {
322320
var volumeRaw libvirt.StorageVol
323321
var volumeQCOW2 libvirt.StorageVol
324-
322+
randomVolumeNameRaw := acctest.RandString(10)
323+
randomVolumeNameQCOW := acctest.RandString(10)
325324
qcow2Path, err := filepath.Abs("testdata/test.qcow2")
326325
if err != nil {
327326
t.Fatal(err)
@@ -332,19 +331,15 @@ func TestAccLibvirtVolume_DownloadFromSourceFormat(t *testing.T) {
332331
t.Fatal(err)
333332
}
334333

335-
const testAccCheckLibvirtVolumeConfigSource = `
336-
resource "libvirt_volume" "terraform-acceptance-test-raw" {
334+
config := fmt.Sprintf(`
335+
resource "libvirt_volume" "%s" {
337336
name = "terraform-test-raw"
338337
source = "%s"
339338
}
340-
341-
resource "libvirt_volume" "terraform-acceptance-test-qcow2" {
339+
resource "libvirt_volume" "%s" {
342340
name = "terraform-test-qcow2"
343341
source = "%s"
344-
}`
345-
config := fmt.Sprintf(testAccCheckLibvirtVolumeConfigSource,
346-
fmt.Sprintf("file://%s", rawPath),
347-
fmt.Sprintf("file://%s", qcow2Path))
342+
}`, randomVolumeNameRaw, fmt.Sprintf("file://%s", rawPath), randomVolumeNameQCOW, fmt.Sprintf("file://%s", qcow2Path))
348343

349344
resource.Test(t, resource.TestCase{
350345
PreCheck: func() { testAccPreCheck(t) },
@@ -354,16 +349,16 @@ func TestAccLibvirtVolume_DownloadFromSourceFormat(t *testing.T) {
354349
{
355350
Config: config,
356351
Check: resource.ComposeTestCheckFunc(
357-
testAccCheckLibvirtVolumeExists("libvirt_volume.terraform-acceptance-test-raw", &volumeRaw),
358-
testAccCheckLibvirtVolumeExists("libvirt_volume.terraform-acceptance-test-qcow2", &volumeQCOW2),
352+
testAccCheckLibvirtVolumeExists("libvirt_volume."+randomVolumeNameRaw, &volumeRaw),
353+
testAccCheckLibvirtVolumeExists("libvirt_volume."+randomVolumeNameQCOW, &volumeQCOW2),
359354
resource.TestCheckResourceAttr(
360-
"libvirt_volume.terraform-acceptance-test-raw", "name", "terraform-test-raw"),
355+
"libvirt_volume."+randomVolumeNameRaw, "name", "terraform-test-raw"),
361356
resource.TestCheckResourceAttr(
362-
"libvirt_volume.terraform-acceptance-test-raw", "format", "raw"),
357+
"libvirt_volume."+randomVolumeNameRaw, "format", "raw"),
363358
resource.TestCheckResourceAttr(
364-
"libvirt_volume.terraform-acceptance-test-qcow2", "name", "terraform-test-qcow2"),
359+
"libvirt_volume."+randomVolumeNameQCOW, "name", "terraform-test-qcow2"),
365360
resource.TestCheckResourceAttr(
366-
"libvirt_volume.terraform-acceptance-test-qcow2", "format", "qcow2"),
361+
"libvirt_volume."+randomVolumeNameQCOW, "format", "qcow2"),
367362
),
368363
},
369364
},
@@ -372,29 +367,28 @@ func TestAccLibvirtVolume_DownloadFromSourceFormat(t *testing.T) {
372367

373368
func TestAccLibvirtVolume_Format(t *testing.T) {
374369
var volume libvirt.StorageVol
375-
376-
const testAccCheckLibvirtVolumeConfigFormat = `
377-
resource "libvirt_volume" "terraform-acceptance-test-3" {
378-
name = "terraform-test"
379-
format = "raw"
380-
size = 1073741824
381-
}`
370+
randomVolumeName := acctest.RandString(10)
382371

383372
resource.Test(t, resource.TestCase{
384373
PreCheck: func() { testAccPreCheck(t) },
385374
Providers: testAccProviders,
386375
CheckDestroy: testAccCheckLibvirtVolumeDestroy,
387376
Steps: []resource.TestStep{
388377
{
389-
Config: testAccCheckLibvirtVolumeConfigFormat,
378+
Config: fmt.Sprintf(`
379+
resource "libvirt_volume" "%s" {
380+
name = "terraform-test"
381+
format = "raw"
382+
size = 1073741824
383+
}`, randomVolumeName),
390384
Check: resource.ComposeTestCheckFunc(
391-
testAccCheckLibvirtVolumeExists("libvirt_volume.terraform-acceptance-test-3", &volume),
385+
testAccCheckLibvirtVolumeExists("libvirt_volume."+randomVolumeName, &volume),
392386
resource.TestCheckResourceAttr(
393-
"libvirt_volume.terraform-acceptance-test-3", "name", "terraform-test"),
387+
"libvirt_volume."+randomVolumeName, "name", "terraform-test"),
394388
resource.TestCheckResourceAttr(
395-
"libvirt_volume.terraform-acceptance-test-3", "size", "1073741824"),
389+
"libvirt_volume."+randomVolumeName, "size", "1073741824"),
396390
resource.TestCheckResourceAttr(
397-
"libvirt_volume.terraform-acceptance-test-3", "format", "raw"),
391+
"libvirt_volume."+randomVolumeName, "format", "raw"),
398392
),
399393
},
400394
},
@@ -403,33 +397,30 @@ func TestAccLibvirtVolume_Format(t *testing.T) {
403397

404398
func TestAccLibvirtVolume_Import(t *testing.T) {
405399
var volume libvirt.StorageVol
406-
407-
const testAccCheckLibvirtVolumeConfigImport = `
408-
resource "libvirt_volume" "terraform-acceptance-test-4" {
409-
name = "terraform-test"
410-
format = "raw"
411-
size = 1073741824
412-
}`
413-
414-
resourceName := "libvirt_volume.terraform-acceptance-test-4"
400+
randomVolumeName := acctest.RandString(10)
415401

416402
resource.Test(t, resource.TestCase{
417403
PreCheck: func() { testAccPreCheck(t) },
418404
Providers: testAccProviders,
419405
CheckDestroy: testAccCheckLibvirtVolumeDestroy,
420406
Steps: []resource.TestStep{
421407
resource.TestStep{
422-
Config: testAccCheckLibvirtVolumeConfigImport,
408+
Config: fmt.Sprintf(`
409+
resource "libvirt_volume" "%s" {
410+
name = "terraform-test"
411+
format = "raw"
412+
size = 1073741824
413+
}`, randomVolumeName),
423414
},
424415
resource.TestStep{
425-
ResourceName: resourceName,
416+
ResourceName: "libvirt_volume." + randomVolumeName,
426417
ImportState: true,
427418
Check: resource.ComposeTestCheckFunc(
428-
testAccCheckLibvirtVolumeExists("libvirt_volume.terraform-acceptance-test-4", &volume),
419+
testAccCheckLibvirtVolumeExists("libvirt_volume."+randomVolumeName, &volume),
429420
resource.TestCheckResourceAttr(
430-
"libvirt_volume.terraform-acceptance-test-4", "name", "terraform-test"),
421+
"libvirt_volume."+randomVolumeName, "name", "terraform-test"),
431422
resource.TestCheckResourceAttr(
432-
"libvirt_volume.terraform-acceptance-test-4", "size", "1073741824"),
423+
"libvirt_volume."+randomVolumeName, "size", "1073741824"),
433424
),
434425
},
435426
},

0 commit comments

Comments
 (0)