Changeset 96849 in vbox for trunk/src/VBox/Main/testcase

Timestamp:

Sep 24, 2022 1:55:24 AM (2 years ago)

Author:

vboxsync

Message:

fixed tstOVF so it no longer leaves a mess after failure, removed tstOVF from ValidationKit blacklist

File:

• trunk/src/VBox/Main/testcase/tstOVF.cpp (modified) (2 diffs)

trunk/src/VBox/Main/testcase/tstOVF.cpp

@@ -232 +232 @@
                     pcszType = "sound";
                 break;
+                                
+                                case VirtualSystemDescriptionType_SettingsFile:
+                    pcszType = "settings";
+                break;
+                                
+                                case VirtualSystemDescriptionType_BaseFolder:
+                    pcszType = "basefolder";
+                break;
+                                
+                                case VirtualSystemDescriptionType_PrimaryGroup:
+                    pcszType = "primarygroup";
+                break;
 
                 default:
-                    throw MyError(E_UNEXPECTED, "Invalid VirtualSystemDescriptionType\n");
+                    throw MyError(E_UNEXPECTED, "Invalid VirtualSystemDescriptionType (enum)\n");
                 break;
             }
@@ -289 +301 @@
     RTPrintf("%s: copying ovf-dummy.vmdk to \"%s\"...\n", pcszPrefix, pcszDest);
 
+        if (FILE *file = fopen(pcszDest, "r"))
+        {
+                fclose(file);
+                RTFileDelete(pcszDest);
+        }
+
     int vrc = RTFileCopy(szSrc, szDst);
     if (RT_FAILURE(vrc)) throw MyError(0, Utf8StrFmt("Cannot copy ovf-dummy.vmdk to %s: %Rra\n", pcszDest, vrc).c_str());