Fix disk size test

Default minimum and maximum sizes were geared towards spinning up windows server instances. Linux instances are far more efficient and make do with lower requirements. Set the minimum sizes to match this.
pull/2576/head
Taliesin Sisson 11 years ago
parent 15137310a7
commit 730c6217ad

@ -22,15 +22,15 @@ import (
)
const (
DefaultDiskSize = 40000 // ~40GB
MinDiskSize = 10 * 1024 // 10GB
MaxDiskSize = 65536 * 1024 // 64TB
DefaultDiskSize = 40 * 1024 // ~40GB
MinDiskSize = 256 // 256MB
MaxDiskSize = 64 * 1024 * 1024 // 64TB
DefaultRamSize = 1024 // 1GB
MinRamSize = 512 // 512MB
MaxRamSize = 32768 // 32GB
DefaultRamSize = 1 * 1024 // 1GB
MinRamSize = 32 // 32MB
MaxRamSize = 32 * 1024 // 32GB
LowRam = 512 // 512MB
LowRam = 384 // 384MB
DefaultUsername = "vagrant"
DefaultPassword = "vagrant"
@ -416,9 +416,9 @@ func (b *Builder) checkDiskSize() error {
log.Println(fmt.Sprintf("%s: %v", "DiskSize", b.config.DiskSize))
if b.config.DiskSize < MinDiskSize {
return fmt.Errorf("disk_size_gb: Windows server requires disk space >= %v GB, but defined: %v", MinDiskSize, b.config.DiskSize/1024)
return fmt.Errorf("disk_size_gb: Virtual machine requires disk space >= %v GB, but defined: %v", MinDiskSize, b.config.DiskSize/1024)
} else if b.config.DiskSize > MaxDiskSize {
return fmt.Errorf("disk_size_gb: Windows server requires disk space <= %v GB, but defined: %v", MaxDiskSize, b.config.DiskSize/1024)
return fmt.Errorf("disk_size_gb: Virtual machine requires disk space <= %v GB, but defined: %v", MaxDiskSize, b.config.DiskSize/1024)
}
return nil
@ -432,9 +432,9 @@ func (b *Builder) checkRamSize() error {
log.Println(fmt.Sprintf("%s: %v", "RamSize", b.config.RamSizeMB))
if b.config.RamSizeMB < MinRamSize {
return fmt.Errorf("ram_size_mb: Windows server requires memory size >= %v MB, but defined: %v", MinRamSize, b.config.RamSizeMB)
return fmt.Errorf("ram_size_mb: Virtual machine requires memory size >= %v MB, but defined: %v", MinRamSize, b.config.RamSizeMB)
} else if b.config.RamSizeMB > MaxRamSize {
return fmt.Errorf("ram_size_mb: Windows server requires memory size <= %v MB, but defined: %v", MaxRamSize, b.config.RamSizeMB)
return fmt.Errorf("ram_size_mb: Virtual machine requires memory size <= %v MB, but defined: %v", MaxRamSize, b.config.RamSizeMB)
}
return nil

@ -13,7 +13,8 @@ func testConfig() map[string]interface{} {
"iso_url": "http://www.packer.io",
"shutdown_command": "yes",
"ssh_username": "foo",
"ram_size_mb": 64,
"disk_size": 256,
packer.BuildNameConfigKey: "foo",
}
}
@ -55,11 +56,11 @@ func TestBuilderPrepare_DiskSize(t *testing.T) {
t.Fatalf("bad err: %s", err)
}
if b.config.DiskSize != 40000 {
if b.config.DiskSize != 40 * 1024 {
t.Fatalf("bad size: %d", b.config.DiskSize)
}
config["disk_size"] = 60000
config["disk_size"] = 256
b = Builder{}
warns, err = b.Prepare(config)
if len(warns) > 0 {
@ -69,7 +70,7 @@ func TestBuilderPrepare_DiskSize(t *testing.T) {
t.Fatalf("should not have error: %s", err)
}
if b.config.DiskSize != 60000 {
if b.config.DiskSize != 256 {
t.Fatalf("bad size: %d", b.config.DiskSize)
}
}

Loading…
Cancel
Save