Improve deleteVapp() testing function

govcd/orgvdcnetwork.go

@@ -87,7 +87,7 @@ func (orgVdcNet *OrgVDCNetwork) Delete() (Task, error) {
 	return *task, nil
 }
 
-// Looks for an Org Vdc network and, if found, will delete it.
+// RemoveOrgVdcNetworkIfExists looks for an Org Vdc network and, if found, will delete it.
 func RemoveOrgVdcNetworkIfExists(vdc Vdc, networkName string) error {
 	network, err := vdc.GetOrgVdcNetworkByName(networkName, true)
 
@@ -102,11 +102,11 @@ func RemoveOrgVdcNetworkIfExists(vdc Vdc, networkName string) error {
 	// The network was found. We attempt deletion
 	task, err := network.Delete()
 	if err != nil {
-		return fmt.Errorf("error deleting network [phase 1] %s", networkName)
+		return fmt.Errorf("error deleting network '%s' [phase 1]: %s", networkName, err)
 	}
 	err = task.WaitTaskCompletion()
 	if err != nil {
-		return fmt.Errorf("error deleting network [task] %s", networkName)
+		return fmt.Errorf("error deleting network '%s' [task]: %s", networkName, err)
 	}
 	return nil
 }

govcd/vm_test.go

@@ -1286,13 +1286,26 @@ func (vcd *TestVCD) Test_VmGetParentvAppAndVdc(check *C) {
 func deleteVapp(vcd *TestVCD, name string) error {
 	vapp, err := vcd.vdc.GetVAppByName(name, true)
 	if err != nil {
-		return fmt.Errorf("error getting vapp: %s", err)
+		return fmt.Errorf("error getting vApp: %s", err)
 	}
 	task, _ := vapp.Undeploy()
 	_ = task.WaitTaskCompletion()
+
+	// Detach all Org networks during vApp removal because network removal errors if it happens
+	// very quickly (as the next task) after vApp removal
+	task, _ = vapp.RemoveAllNetworks()
+	err = task.WaitTaskCompletion()
+	if err != nil {
+		return fmt.Errorf("error removing networks from vApp: %s", err)
+	}
+
 	task, err = vapp.Delete()
 	if err != nil {
-		return fmt.Errorf("error deleting vapp: %s", err)
+		return fmt.Errorf("error deleting vApp: %s", err)
+	}
+	err = task.WaitTaskCompletion()
+	if err != nil {
+		return fmt.Errorf("error waiting for vApp deletion task: %s", err)
 	}
 	return nil
 }