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

Timestamp:

Feb 20, 2019 1:45:36 PM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Validation Kit: Enabled and fixed file write tests.

File:

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

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

@@ -1064 +1064 @@
         reporter.testDone(fSkip);
 
-        # reporter.testStart('File write');
-        # fSkip = 'file_write' not in self.asTests or fRc is False;
-        # if fSkip is False:
-        #     fRc, oTxsSession = self.testGuestCtrlFileWrite(oSession, oTxsSession, oTestVm);
-        # reporter.testDone(fSkip);
+        reporter.testStart('File write');
+        fSkip = 'file_write' not in self.asTests or fRc is False;
+        if fSkip is False:
+            fRc, oTxsSession = self.testGuestCtrlFileWrite(oSession, oTxsSession, oTestVm);
+        reporter.testDone(fSkip);
 
         reporter.testStart('Updating Guest Additions');
@@ -3000 +3000 @@
         aaTests = [];
 
-        cScratchBuf = 512;
-        aScratchBuf = array('b', [random.randint(-128, 127) for i in range(cScratchBuf)]);
+        cScratchBuf = random.randint(1, 4096);
+        aScratchBuf = os.urandom(cScratchBuf);
         aaTests.extend([
             # Write to a non-existing file.
@@ -3011 +3011 @@
         ]);
 
-        aScratchBuf2 = array('b', [random.randint(-128, 127) for i in range(cScratchBuf)]);
+        aScratchBuf2 = os.urandom(cScratchBuf);
         aaTests.extend([
             # Append the same amount of data to the just created file.
@@ -3037 +3037 @@
                     if self.oTstDrv.fpApiVer >= 5.0:
                         curFile = curGuestSession.fileOpenEx(curTest.sFile, curTest.getAccessMode(), curTest.getOpenAction(),
-                                                             curTest.getSharingMode(), []);
+                                                             curTest.getSharingMode(), curTest.lCreationMode, []);
                         curFile.seek(curTest.cbOffset, vboxcon.FileSeekOrigin_Begin);
                     else:
@@ -3050 +3050 @@
                 else:
                     if self.oTstDrv.fpApiVer >= 5.0:
-                        curFile = curGuestSession.fileOpen(curTest.sFile, curTest.getAccessMode(), curTest.getOpenAction(),
-                                                           curTest.lCreationMode);
+                        curFile = curGuestSession.fileOpenEx(curTest.sFile, curTest.getAccessMode(), curTest.getOpenAction(),
+                                                             curTest.getSharingMode(), curTest.lCreationMode, []);
                     else:
                         curFile = curGuestSession.fileOpen(curTest.sFile, curTest.sOpenMode, curTest.sDisposition,
                                                            curTest.lCreationMode);
                 if fRc and curTest.cbToReadWrite > 0:
+                    reporter.log("File '%s' opened" % curTest.sFile);
                     ## @todo Split this up in 64K writes. Later.
                     ## @todo Test timeouts.
@@ -3088 +3089 @@
                           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));
+                            reporter.error('Test #%d failed: Read back buffer (%d bytes) does not match written content (%d bytes)' \
+                                           % (i, len(curRes.aBuf), len(aBufRead)));
+                            reporter.error('Test #%d failed: Got:\n%s' % (i, aBufRead.encode('hex')));
+                            reporter.error('Test #%d failed: Expected:\n%s' % (i, curRes.aBuf.encode('hex')));
                             fRc = False;
                 # Test final offset.
@@ -3099 +3102 @@
                     fRc = False;
                 curFile.close();
+                reporter.log("File '%s' closed" % curTest.sFile);
             except:
                 reporter.logXcpt('Opening "%s" failed:' % (curTest.sFile,));