Changeset 79324 in vbox

Timestamp:

Jun 25, 2019 1:39:46 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131544

Message:

ValKit/tdAddGuestCtrl.py: Finished the remove (delete) tests. bugref:9320

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/base.py (modified) (1 diff)
• tests/additions/tdAddGuestCtrl.py (modified) (10 diffs)

trunk/src/VBox/ValidationKit/testdriver/base.py

@@ -1638 +1638 @@
             iRc = self.innerMain(asArgs);
         except:
+            reporter.logXcpt();
             try:
                 self.onExit(-1);

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -390 +390 @@
             return reporter.errorXcpt('fsObjExists failed on "%s" after deletion (type: %s)' % (self.sPath, sType));
         if fExists:
-            return reporter.errorXcpt('fsObjExists says "%s" still exists after deletion (type: %s)!' % (self.sPath, sType));
+            return reporter.error('fsObjExists says "%s" still exists after deletion (type: %s)!' % (self.sPath, sType));
         return True;
 
@@ -409 +409 @@
         except:
             reporter.maybeErrXcpt(self.fRcExpect, 'Removing "%s" failed' % (self.sPath,));
-            return False;
+            return not self.fRcExpect;
+        if not self.fRcExpect:
+            return reporter.error('Expected removing "%s" to failed, but it succeeded' % (self.sPath,));
+
         return self.checkRemoved('file');
 
@@ -426 +429 @@
         except:
             reporter.maybeErrXcpt(self.fRcExpect, 'Removing "%s" (as a directory) failed' % (self.sPath,));
-            return False;
+            return not self.fRcExpect;
+        if not self.fRcExpect:
+            return reporter.error('Expected removing "%s" (dir) to failed, but it succeeded' % (self.sPath,));
+
         return self.checkRemoved('directory');
 
@@ -433 +439 @@
     Recursively remove a directory tree.
     """
-    def __init__(self, sPath, afFlags = None, fRcExpect = True, sUser = None, sPassword = None):
+    def __init__(self, sPath, afFlags = None, fRcExpect = True, fNotExist = False, sUser = None, sPassword = None):
         tdTestRemoveBase.__init__(self, sPath, fRcExpect, sUser, sPassword);
         self.afFlags = afFlags if afFlags is not None else [];
+        self.fNotExist = fNotExist; # Hack for the ContentOnly scenario where the dir does not exist.
 
     def execute(self, oSubTstDrv):
@@ -444 +451 @@
             reporter.maybeErrXcpt(self.fRcExpect, 'Removing directory tree "%s" failed (afFlags=%s)'
                                   % (self.sPath, self.afFlags));
-            return False;
+            return not self.fRcExpect;
 
         oWrappedProgress = vboxwrappers.ProgressWrapper(oProgress, oSubTstDrv.oTstDrv.oVBoxMgr, oSubTstDrv.oTstDrv,
@@ -451 +458 @@
         if not oWrappedProgress.isSuccess():
             oWrappedProgress.logResult(fIgnoreErrors = not self.fRcExpect);
-            return False;
-
-        if vboxcon.DirectoryRemoveRecFlag_ContentOnly in self.afFlags:
+            return not self.fRcExpect;
+        if not self.fRcExpect:
+            return reporter.error('Expected removing "%s" (tree) to failed, but it succeeded' % (self.sPath,));
+
+        if vboxcon.DirectoryRemoveRecFlag_ContentAndDir not in self.afFlags  and  not self.fNotExist:
             # Cannot use directoryExists here as it is buggy.
             try:
@@ -3424 +3433 @@
         """
 
-        # Something is busted here wrt progress wrappers or something... debugging.
-        if self.oTstDrv.fpApiVer < 10.0:
-            return None;
-
         #
         # Create a directory with a few files in it using TXS that we'll use for the initial tests.
@@ -3461 +3466 @@
                 return reporter.error('Failed to create test file "%s"!' % (sFile,));
 
-
         #
         # Tear down the directories and files.
@@ -3486 +3490 @@
             tdTestRemoveFile(asTestFiles[0], fRcExpect = True),
             tdTestRemoveFile(asTestFiles[0], fRcExpect = False),
-            tdTestRemoveTree(asTestDirs[9], fRcExpect = False), # Have subdirs, no flags == single rmdir.
-            tdTestRemoveTree(asTestDirs[9], afFlags = [vboxcon.DirectoryRemoveRecFlag_ContentOnly,], fRcExpect = True),
-            tdTestRemoveTree(asTestDirs[9], fRcExpect = True),
-            tdTestRemoveTree(asTestDirs[3], fRcExpect = False), # Have subdirs & files, no flags == single rmdir.
+            # 17:
+            tdTestRemoveTree(asTestDirs[8], fRcExpect = True),  # Removes empty subdirs and leaves the dir itself.
+            tdTestRemoveDir(asTestDirs[8], fRcExpect = True),
+            tdTestRemoveTree(asTestDirs[3], fRcExpect = False), # Have subdirs & files,
             tdTestRemoveTree(asTestDirs[3], afFlags = [vboxcon.DirectoryRemoveRecFlag_ContentOnly,], fRcExpect = True),
-            tdTestRemoveTree(asTestDirs[3], fRcExpect = True),
+            tdTestRemoveDir(asTestDirs[3], fRcExpect = True),
             tdTestRemoveTree(asTestDirs[0], afFlags = [vboxcon.DirectoryRemoveRecFlag_ContentAndDir,], fRcExpect = True),
-            tdTestRemoveTree(asTestDirs[0], afFlags = [vboxcon.DirectoryRemoveRecFlag_ContentAndDir,], fRcExpect = False),
+            # No error if already delete (RTDirRemoveRecursive artifact).
+            tdTestRemoveTree(asTestDirs[0], afFlags = [vboxcon.DirectoryRemoveRecFlag_ContentAndDir,], fRcExpect = True),
+            tdTestRemoveTree(asTestDirs[0], afFlags = [vboxcon.DirectoryRemoveRecFlag_ContentOnly,],
+                             fNotExist = True, fRcExpect = True),
+            # Exception is when not specifying any flags the the guest does not call RTDirRemoveRecursive but does its own thing.
+            tdTestRemoveTree(asTestDirs[0], afFlags = [], fRcExpect = False),
         ];
 
@@ -3509 +3518 @@
             fRc = oTest.execute(self) and fRc;
             fRc = oTest.closeSession() and fRc;
-
 
         if fRc is True: