Changeset 83515 in vbox

Timestamp:

Apr 2, 2020 4:17:03 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/Validation Kit: Adjustments for VBox < 6.0. bugref:9320

File:

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

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

@@ -1789 +1789 @@
             except Exception as oXcpt:
                 if vbox.ComError.notEqual(oXcpt, vbox.ComError.VBOX_E_OBJECT_NOT_FOUND):
-                    reporter.errorXcpt('Error reading directory "%s":' % (sCurDir,));
+                    if oTstDrv.fpApiVer > 5.2:
+                        reporter.errorXcpt('Error reading directory "%s":' % (sCurDir,));
+                    else:
+                        # Unlike fileOpen, directoryOpen will not fail if the directory does not exist.
+                        reporter.maybeErrXcpt(fIsError, 'Error reading directory "%s":' % (sCurDir,));
                     fRc = False;
                 else:
@@ -3744 +3748 @@
             [ tdTestFileOpen(sFile = oTestVm.pathJoin(sTempDir, 'no-such-dir', 'no-such-file')),        tdTestResultFailure() ],
         ];
-        atTests.extend([
-            # Wrong type:
-            [ tdTestFileOpen(sFile = self.getGuestTempDir(oTestVm)),                                tdTestResultFailure() ],
-            [ tdTestFileOpen(sFile = self.getGuestSystemDir(oTestVm)),                              tdTestResultFailure() ],
-        ]);
+        if self.oTstDrv.fpApiVer > 5.2: # Fixed since 6.0.
+            atTests.extend([
+                # Wrong type:
+                [ tdTestFileOpen(sFile = self.getGuestTempDir(oTestVm)),                                tdTestResultFailure() ],
+                [ tdTestFileOpen(sFile = self.getGuestSystemDir(oTestVm)),                              tdTestResultFailure() ],
+            ]);
         atTests.extend([
             # O_EXCL and such: