Changeset 79228 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jun 19, 2019 6:15:12 AM (6 years ago)

Author:

vboxsync

Message:

tdAddGuestCtrl.py: 5.2 adjustments. bugref:9151 bugref:9320

File:

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

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

@@ -2793 +2793 @@
             [ tdTestDirCreate(sDirectory = '' ), tdTestResultFailure() ],
             # More unusual stuff.
-            [ tdTestDirCreate(sDirectory = oTestVm.pathJoin('..', '..') ), tdTestResultFailure() ],
             [ tdTestDirCreate(sDirectory = oTestVm.pathJoin('..', '.') ), tdTestResultFailure() ],
         ];
+        if True: #self.oTstDrv.fpApiVer > 5.2:
+            atTests.extend([
+                [ tdTestDirCreate(sDirectory = oTestVm.pathJoin('..', '..') ), tdTestResultFailure() ],
+                [ tdTestDirCreate(sDirectory = '..' ), tdTestResultFailure() ],
+                [ tdTestDirCreate(sDirectory = '../' ), tdTestResultFailure() ],
+                [ tdTestDirCreate(sDirectory = '../../' ), tdTestResultFailure() ],
+            ]);
+
         if oTestVm.isWindows() or oTestVm.isOS2():
             atTests.extend([
-                [ tdTestDirCreate(sDirectory = '..' ), tdTestResultFailure() ],
-                [ tdTestDirCreate(sDirectory = '../' ), tdTestResultFailure() ],
-                [ tdTestDirCreate(sDirectory = '../..' ), tdTestResultFailure() ],
-                [ tdTestDirCreate(sDirectory = '../../' ), tdTestResultFailure() ],
                 [ tdTestDirCreate(sDirectory = 'C:\\' ), tdTestResultFailure() ],
                 [ tdTestDirCreate(sDirectory = 'C:\\..' ), tdTestResultFailure() ],
@@ -2814 +2817 @@
         else:
             atTests.extend([
-                [ tdTestDirCreate(sDirectory = '../' ), tdTestResultFailure() ],
-                [ tdTestDirCreate(sDirectory = '../../' ), tdTestResultFailure() ],
                 [ tdTestDirCreate(sDirectory = '/' ), tdTestResultFailure() ],
                 [ tdTestDirCreate(sDirectory = '/..' ), tdTestResultFailure() ],
@@ -2863 +2864 @@
             fRc = oCurTest.closeSession(fIsError = True) and fRc;
             if fRc is False:
-                reporter.error('Test #%d failed' % (i,));
-                break;
+                fRc = reporter.error('Test #%d failed' % (i,));
 
         return (fRc, oTxsSession);
@@ -3897 +3897 @@
               tdTestResultSuccess() ],
         ]);
-        if self.oTstDrv.fpApiVer >= 5.2:
+        if self.oTstDrv.fpApiVer > 5.2:
             # Copy into a directory.
             atTests.extend([