Changeset 77477 in vbox for trunk/src

Timestamp:

Feb 27, 2019 10:40:15 AM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Validation Kit: Logging for file_write tests (Pylint fix).

File:

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

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

@@ -138 +138 @@
         self.oTest = tdCtxTest(oSession, oTxsSession, oTestVm);
         return self.oTest;
+
+    def uploadLogData(self, oTstDrv, aData, sFileName, sDesc):
+        """
+        Uploads (binary) data to a log file for manual (later) inspection.
+        """
+        reporter.log('Creating + uploading log data file "%s"' % sFileName);
+        sHstFileName = os.path.join(oTstDrv.sScratchPath, sFileName);
+        try:
+            oCurTestFile     = open(sHstFileName, "wb");
+            oCurTestFile.write(aData);
+            oCurTestFile.close();
+            reporter.addLogFile(sHstFileName, 'misc/other', sDesc);
+        except:
+            reporter.error('Unable to create temporary file for "%s"' % sDesc);
 
     def createSession(self, sName):
@@ -3100 +3114 @@
 
                             # Create files with buffer contents and upload those for later (manual) inspection.
-                            sHstFileName = os.path.join(self.oTstDrv.sScratchPath, ('testGuestCtrlWriteTest%d-BufExcepted' % i));
-                            try:
-                                oCurTestFile     = open(sHstFileName, "wb");
-                                oCurTestFile.write(curRes.aBuf);
-                                oCurTestFile.close();
-                                reporter.addLogFile(sHstFileName, 'misc/other', 'Test #%d: Expected buffer' % i);
-                            except:
-                                reporter.error('Test #%d failed: Unable to create temporary expected buffer file "%s"' \
-                                               % (i, sHstFileName));
-
-                            sHstFileName = os.path.join(self.oTstDrv.sScratchPath, ('testGuestCtrlWriteTest%d-BufGot' % i));
-                            try:
-                                oCurTestFile     = open(sHstFileName, "wb");
-                                oCurTestFile.write(aBufRead);
-                                oCurTestFile.close();
-                                reporter.addLogFile(sHstFileName, 'misc/other', 'Test #%d: Got buffer' % i);
-                            except:
-                                reporter.error('Test #%d failed: Unable to create temporary got buffer file "%s"' \
-                                               % (i, sHstFileName));
+                            self.uploadLogData(self.oTstDrv, curRes.aBuf, ('testGuestCtrlWriteTest%d-BufExcepted' % i),
+                                                                          ('Test #%d: Expected buffer' % i));
+                            self.uploadLogData(self.oTstDrv, aBufRead,    ('testGuestCtrlWriteTest%d-BufGot' % i),
+                                                                          ('Test #%d: Got buffer' % i));
                             fRc = False;
                 # Test final offset.