Changeset 83511 in vbox for trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

Timestamp:

Apr 2, 2020 2:40:38 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/Validation Kit: Enabled more tests (IGuestSession::directoryOpen() API + trying to open directories on Linux as files). bugref:9320

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (5 diffs)

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

@@ -1775 +1775 @@
         cOthers  = 0;    # Other files.
 
-        ##
-        ## @todo r=bird: Unlike fileOpen, directoryOpen will not fail if the directory does not exist.
-        ##       This is of course a bug in the implementation, as it is documented to return
-        ##       VBOX_E_OBJECT_NOT_FOUND or VBOX_E_IPRT_ERROR!
-        ##
-
         # Open the directory:
-        #reporter.log2('Directory="%s", filter="%s", afFlags="%s"' % (sCurDir, sFilter, afFlags));
+        reporter.log2('Directory="%s", filter="%s", afFlags="%s"' % (sCurDir, sFilter, afFlags));
         try:
             oCurDir = oGuestSession.directoryOpen(sCurDir, sFilter, afFlags);
@@ -1795 +1789 @@
             except Exception as oXcpt:
                 if vbox.ComError.notEqual(oXcpt, vbox.ComError.VBOX_E_OBJECT_NOT_FOUND):
-                    ##
-                    ## @todo r=bird: Change this to reporter.errorXcpt() once directoryOpen() starts
-                    ##       working the way it is documented.
-                    ##
-                    reporter.maybeErrXcpt(fIsError, 'Error reading directory "%s":' % (sCurDir,)); # See above why 'maybe'.
+                    reporter.errorXcpt('Error reading directory "%s":' % (sCurDir,));
                     fRc = False;
-                #else: reporter.log2('\tNo more directory entries for "%s"' % (sCurDir,));
+                else:
+                    reporter.log2('\tNo more directory entries for "%s"' % (sCurDir,));
                 break;
 
@@ -1816 +1807 @@
                                          % (sName, eType, vboxcon.FsObjType_Directory));
             elif eType == vboxcon.FsObjType_Directory:
-                #reporter.log2('  Directory "%s"' % oFsObjInfo.name);
+                reporter.log2('  Directory "%s"' % oFsObjInfo.name);
                 aSubResult = self.gctrlReadDirTree(oTest, oGuestSession, fIsError,
                                                    oTestVm.pathJoin(sSubDir, sName) if sSubDir else sName);
@@ -1824 +1815 @@
                 cOthers += aSubResult[3];
             elif eType is vboxcon.FsObjType_File:
-                #reporter.log2('  File "%s"' % oFsObjInfo.name);
+                reporter.log2('  File "%s"' % oFsObjInfo.name);
                 cFiles += 1;
             elif eType is vboxcon.FsObjType_Symlink:
-                 #reporter.log2('  Symlink "%s" -- not tested yet' % oFsObjInfo.name);
+                reporter.log2('  Symlink "%s" -- not tested yet' % oFsObjInfo.name);
                 cOthers += 1;
             elif    oTestVm.isWindows() \
@@ -3753 +3744 @@
             [ tdTestFileOpen(sFile = oTestVm.pathJoin(sTempDir, 'no-such-dir', 'no-such-file')),        tdTestResultFailure() ],
         ];
-        if oTestVm.isWindows() or not self.fSkipKnownBugs: # We can open directories on linux, but we shouldn't, right...
-            atTests.extend([
-                # Wrong type:
-                [ tdTestFileOpen(sFile = self.getGuestTempDir(oTestVm)),                                tdTestResultFailure() ],
-                [ tdTestFileOpen(sFile = self.getGuestSystemDir(oTestVm)),                              tdTestResultFailure() ],
-            ]);
+        atTests.extend([
+            # Wrong type:
+            [ tdTestFileOpen(sFile = self.getGuestTempDir(oTestVm)),                                tdTestResultFailure() ],
+            [ tdTestFileOpen(sFile = self.getGuestSystemDir(oTestVm)),                              tdTestResultFailure() ],
+        ]);
         atTests.extend([
             # O_EXCL and such: