Changeset 70660 in vbox for trunk/src/VBox/ValidationKit/tests/additions

Timestamp:

Jan 21, 2018 4:18:58 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: Python 3 and pylint 1.8.1 adjustments/fixes.

File:

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

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

@@ -3168 +3168 @@
             curTest = aTest[0]; # tdTestFileReadWrite, use an index, later.
             curRes  = aTest[1]; # tdTestResult
-            reporter.log('Testing #%d, sFile="%s", cbToReadWrite=%d, sOpenMode="%s", sDisposition="%s", cbOffset=%d ...' % \
+            reporter.log('Testing #%d, sFile="%s", cbToReadWrite=%d, sOpenMode="%s", sDisposition="%s", cbOffset=%d ...' %
                          (i, curTest.sFile, curTest.cbToReadWrite, curTest.sOpenMode, curTest.sDisposition, curTest.cbOffset));
             curTest.setEnvironment(oSession, oTxsSession, oTestVm);
@@ -3175 +3175 @@
                 reporter.error('Test #%d failed: Could not create session' % (i,));
                 break;
+
             try:
                 if curTest.cbOffset > 0: # The offset parameter is gone.
@@ -3182 +3183 @@
                         curFile.seek(curTest.cbOffset, vboxcon.FileSeekOrigin_Begin);
                     else:
-                        curFile = curGuestSession.fileOpenEx(curTest.sFile, curTest.sOpenMode, curTest.sDisposition, \
+                        curFile = curGuestSession.fileOpenEx(curTest.sFile, curTest.sOpenMode, curTest.sDisposition,
                                                              curTest.sSharingMode, curTest.lCreationMode, curTest.cbOffset);
                     curOffset = long(curFile.offset);
                     resOffset = long(curTest.cbOffset);
                     if curOffset != resOffset:
-                        reporter.error('Test #%d failed: Initial offset on open does not match: Got %d, expected %d' \
+                        reporter.error('Test #%d failed: Initial offset on open does not match: Got %d, expected %d'
                                        % (i, curOffset, resOffset));
                         fRc = False;
@@ -3195 +3196 @@
                                                            curTest.lCreationMode);
                     else:
-                        curFile = curGuestSession.fileOpen(curTest.sFile, curTest.sOpenMode, curTest.sDisposition, \
+                        curFile = curGuestSession.fileOpen(curTest.sFile, curTest.sOpenMode, curTest.sDisposition,
                                                            curTest.lCreationMode);
-                if  fRc \
-                and curTest.cbToReadWrite > 0:
+                if fRc and curTest.cbToReadWrite > 0:
                     ## @todo Split this up in 64K writes. Later.
                     ## @todo Test timeouts.
                     cBytesWritten = curFile.write(curTest.aBuf, 30 * 1000);
-                    if  curRes.cbProcessed > 0 \
-                    and curRes.cbProcessed != cBytesWritten:
-                        reporter.error('Test #%d failed: Written buffer length does not match: Got %d, expected %d' \
+                    if    curRes.cbProcessed > 0 \
+                      and curRes.cbProcessed != cBytesWritten:
+                        reporter.error('Test #%d failed: Written buffer length does not match: Got %d, expected %d'
                                        % (i, cBytesWritten, curRes.cbProcessed));
                         fRc = False;
@@ -3218 +3218 @@
                             reporter.logXcpt('Seeking back to initial write position failed:');
                             fRc = False;
-                        if  fRc \
-                        and long(curFile.offset) != curTest.cbOffset:
-                            reporter.error('Test #%d failed: Initial write position does not match current position, \
-                                           got %d, expected %d' \
-                                           % (i, long(curFile.offset), curTest.cbOffset));
+                        if fRc and long(curFile.offset) != curTest.cbOffset:
+                            reporter.error('Test #%d failed: Initial write position does not match current position, '
+                                           'got %d, expected %d' % (i, long(curFile.offset), curTest.cbOffset));
                             fRc = False;
                     if fRc:
                         aBufRead = curFile.read(curTest.cbToReadWrite, 30 * 1000);
                         if len(aBufRead) != curTest.cbToReadWrite:
-                            reporter.error('Test #%d failed: Got buffer length %d, expected %d' \
+                            reporter.error('Test #%d failed: Got buffer length %d, expected %d'
                                            % (i, len(aBufRead), curTest.cbToReadWrite));
                             fRc = False;
-                        if  fRc \
-                        and curRes.aBuf is not None \
-                        and buffer(curRes.aBuf) != aBufRead:
-                            reporter.error('Test #%d failed: Got buffer\n%s, expected\n%s' \
+                        if    fRc \
+                          and curRes.aBuf is not None \
+                          and curRes.aBuf != aBufRead:
+                            reporter.error('Test #%d failed: Got buffer\n%s, expected\n%s'
                                            % (i, aBufRead, curRes.aBuf));
                             fRc = False;
@@ -3240 +3238 @@
                 resOffset = long(curRes.cbOffset);
                 if curOffset != resOffset:
-                    reporter.error('Test #%d failed: Final offset does not match: Got %d, expected %d' \
+                    reporter.error('Test #%d failed: Final offset does not match: Got %d, expected %d'
                                    % (i, curOffset, resOffset));
                     fRc = False;