iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inspections

Browse Source
This commit is contained in:
Vladislav Rassokhin 2019-07-13 20:56:43 +03:00
parent ddbc7bb631
commit b6cc2f01c7
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
driver/vm_clone_acc_test.go
View File

@ -122,7 +122,10 @@ func configureCheck(t *testing.T, vm *VirtualMachine, _ *CloneConfig) {
MemoryHotAddEnabled: true, MemoryHotAddEnabled: true,
CpuHotAddEnabled: true, CpuHotAddEnabled: true,
} }
vm.Configure(hwConfig) err := vm.Configure(hwConfig)
if err != nil {
t.Fatalf("Failed to configure VM: %v", err)
}
log.Printf("[DEBUG] Running checks") log.Printf("[DEBUG] Running checks")
vmInfo, err := vm.Info("config") vmInfo, err := vm.Info("config")
@ -168,7 +171,10 @@ func configureCheck(t *testing.T, vm *VirtualMachine, _ *CloneConfig) {
func configureRAMReserveAllCheck(t *testing.T, vm *VirtualMachine, _ *CloneConfig) { func configureRAMReserveAllCheck(t *testing.T, vm *VirtualMachine, _ *CloneConfig) {
log.Printf("[DEBUG] Configuring the vm") log.Printf("[DEBUG] Configuring the vm")
vm.Configure(&HardwareConfig{RAMReserveAll: true}) err := vm.Configure(&HardwareConfig{RAMReserveAll: true})
if err != nil {
t.Fatalf("Failed to configure VM: %v", err)
}
log.Printf("[DEBUG] Running checks") log.Printf("[DEBUG] Running checks")
vmInfo, err := vm.Info("config") vmInfo, err := vm.Info("config")
@ -235,16 +241,25 @@ func startAndStopCheck(t *testing.T, vm *VirtualMachine, config *CloneConfig) {
t.Errorf("'%v' is not a valid ip address", ip) t.Errorf("'%v' is not a valid ip address", ip)
} }
vm.StartShutdown() err := vm.StartShutdown()
if err != nil {
t.Fatalf("Failed to initiate guest shutdown: %v", err)
}
log.Printf("[DEBUG] Waiting max 1m0s for shutdown to complete") log.Printf("[DEBUG] Waiting max 1m0s for shutdown to complete")
vm.WaitForShutdown(context.TODO(), 1*time.Minute) err = vm.WaitForShutdown(context.TODO(), 1*time.Minute)
if err != nil {
t.Fatalf("Failed to wait for giest shutdown: %v", err)
}
} }
func snapshotCheck(t *testing.T, vm *VirtualMachine, config *CloneConfig) { func snapshotCheck(t *testing.T, vm *VirtualMachine, config *CloneConfig) {
stopper := startVM(t, vm, config.Name) stopper := startVM(t, vm, config.Name)
defer stopper() defer stopper()
vm.CreateSnapshot("test-snapshot") err := vm.CreateSnapshot("test-snapshot")
if err != nil {
t.Fatalf("Failed to create snapshot: %v", err)
}
vmInfo, err := vm.Info("layoutEx.disk") vmInfo, err := vm.Info("layoutEx.disk")
if err != nil { if err != nil {
@ -258,7 +273,10 @@ func snapshotCheck(t *testing.T, vm *VirtualMachine, config *CloneConfig) {
} }
func templateCheck(t *testing.T, vm *VirtualMachine, _ *CloneConfig) { func templateCheck(t *testing.T, vm *VirtualMachine, _ *CloneConfig) {
vm.ConvertToTemplate() err := vm.ConvertToTemplate()
if err != nil {
t.Fatalf("Failed to convert to template: %v", err)
}
vmInfo, err := vm.Info("config.template") vmInfo, err := vm.Info("config.template")
if err != nil { if err != nil {
t.Errorf("Cannot read VM properties: %v", err) t.Errorf("Cannot read VM properties: %v", err)

12
iso/builder_acc_test.go
View File

@ -369,10 +369,16 @@ func checkNetworkCard(t *testing.T) builderT.TestCheckFunc {
func TestISOBuilderAcc_createFloppy(t *testing.T) { func TestISOBuilderAcc_createFloppy(t *testing.T) {
tmpFile, err := ioutil.TempFile("", "packer-vsphere-iso-test") tmpFile, err := ioutil.TempFile("", "packer-vsphere-iso-test")
if err != nil { if err != nil {
t.Fatalf("Error creating temp file ") t.Fatalf("Error creating temp file: %v", err)
}
_, err = fmt.Fprint(tmpFile, "Hello, World!")
if err != nil {
t.Fatalf("Error creating temp file: %v", err)
}
err = tmpFile.Close()
if err != nil {
t.Fatalf("Error creating temp file: %v", err)
} }
fmt.Fprint(tmpFile, "Hello, World!")
tmpFile.Close()
builderT.Test(t, builderT.TestCase{ builderT.Test(t, builderT.TestCase{
Builder: &Builder{}, Builder: &Builder{},