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

Timestamp:

Aug 3, 2010 1:00:54 PM (14 years ago)

Author:

vboxsync

Message:

Main: rework new implementation of Machine::Unregister() and Machine::Delete() to be more flexible and still easy to use

File:

• trunk/src/VBox/Main/testcase/tstOVF.cpp (modified) (1 diff)

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

@@ -349 +349 @@
 
             RTPrintf("  Deleting machine %ls...\n", bstrUUID.raw());
-            SafeArray<BSTR> sfaFiles;
-            rc = pMachine->Unregister(true /* fDetachMedia */,
-                                      ComSafeArrayAsOutParam(sfaFiles));
+            SafeIfaceArray<IMedium> sfaMedia;
+            rc = pMachine->Unregister(CleanupMode_DetachAllReturnHardDisksOnly,
+                                      ComSafeArrayAsOutParam(sfaMedia));
             if (FAILED(rc)) throw MyError(rc, "Machine::Unregister() failed\n");
 
-            for (size_t u = 0;
-                 u < sfaFiles.size();
-                 ++u)
-            {
-                RTPrintf("    UnregisterMachine reported disk image %ls\n", sfaFiles[u]);
-                llFiles2Delete.push_back(sfaFiles[u]);
-            }
-
-            rc = pMachine->Delete();
+            ComPtr<IProgress> pProgress;
+            rc = pMachine->Delete(ComSafeArrayAsInParam(sfaMedia), pProgress.asOutParam());
             if (FAILED(rc)) throw MyError(rc, "Machine::DeleteSettings() failed\n");
+            rc = pProgress->WaitForCompletion(-1);
+            if (FAILED(rc)) throw MyError(rc, "Progress::WaitForCompletion() failed\n");
         }
     }