Changeset 79246 in vbox for trunk/src/VBox

Timestamp:

Jun 19, 2019 3:16:07 PM (6 years ago)

Author:

vboxsync

Message:

tdAddGuestCtrl.py: pylint and some other 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

@@ -2178 +2178 @@
                 oGuestSession.processCreate(sCmd,
                                             asArgs if self.oTstDrv.fpApiVer >= 5.0 else asArgs[1:], [],
-                                            [ vboxcon.ProcessCreateFlag_WaitForStdOut ], \
-                                            30 * 1000);
+                                            [ vboxcon.ProcessCreateFlag_WaitForStdOut ], 30 * 1000);
                 # Note: Use a timeout in the call above for not letting the stale processes
                 #       hanging around forever.  This can happen if the installed Guest Additions
@@ -2794 +2793 @@
             # More unusual stuff.
             [ tdTestDirCreate(sDirectory = oTestVm.pathJoin('..', '.') ), tdTestResultFailure() ],
+            [ tdTestDirCreate(sDirectory = oTestVm.pathJoin('..', '..') ), tdTestResultFailure() ],
+            [ tdTestDirCreate(sDirectory = '..' ), tdTestResultFailure() ],
+            [ tdTestDirCreate(sDirectory = '../' ), tdTestResultFailure() ],
+            [ tdTestDirCreate(sDirectory = '../../' ), tdTestResultFailure() ],
+            [ tdTestDirCreate(sDirectory = '/' ), tdTestResultFailure() ],
+            [ tdTestDirCreate(sDirectory = '/..' ), tdTestResultFailure() ],
+            [ tdTestDirCreate(sDirectory = '/../' ), 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([
@@ -2815 +2813 @@
                 [ tdTestDirCreate(sDirectory = '\\\\uncrulez\\foo' ), tdTestResultFailure() ],
             ]);
-        else:
-            atTests.extend([
-                [ tdTestDirCreate(sDirectory = '/' ), tdTestResultFailure() ],
-                [ tdTestDirCreate(sDirectory = '/..' ), tdTestResultFailure() ],
-                [ tdTestDirCreate(sDirectory = '/../' ), tdTestResultFailure() ],
-            ]);
         atTests.extend([
             # Existing directories and files.
@@ -2826 +2818 @@
             [ tdTestDirCreate(sDirectory = self.getGuestSystemShell(oTestVm) ), tdTestResultFailure() ],
             [ tdTestDirCreate(sDirectory = self.getGuestSystemFileForReading(oTestVm) ), tdTestResultFailure() ],
-        ]);
-
-        atTests.extend([
             # Creating directories.
             [ tdTestDirCreate(sDirectory = sScratch ), tdTestResultSuccess() ],