Changeset 79193 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Jun 17, 2019 5:41:18 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131366

Message:

vboxtestfileset.py: Validate the files copied to the host from the guest. bugref:9151 bugref:9320

File:

• trunk/src/VBox/ValidationKit/testdriver/testfileset.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testdriver/testfileset.py

@@ -83 +83 @@
             return bytes(abRet);
         return abRet;
+
+    def equalFile(self, oFile):
+        """ Compares the content of oFile with self.abContent. """
+
+        # Check the size first.
+        try:
+            cbFile = os.fstat(oFile.fileno()).st_size;
+        except:
+            return reporter.errorXcpt();
+        if cbFile != self.cbContent:
+            return reporter.error('file size differs: %s, cbContent=%s' % (cbFile, self.cbContent));
+
+        # Compare the bytes next.
+        offFile = 0;
+        try:
+            oFile.seek(offFile);
+        except:
+            return reporter.error('seek error');
+        while offFile < self.cbContent:
+            cbToRead = self.cbContent - offFile;
+            if cbToRead > 256*1024:
+                cbToRead = 256*1024;
+            try:
+                abRead = oFile.read(cbToRead);
+            except:
+                return reporter.error('read error at offset %s' % (offFile,));
+            cbRead = len(abRead);
+            if cbRead == 0:
+                return reporter.error('premature end of file at offset %s' % (offFile,));
+            if not utils.areBytesEqual(abRead, self.abContent[offFile:(offFile + cbRead)]):
+                return reporter.error('%s byte block at offset %s differs' % (cbRead, offFile,));
+            # Advance:
+            offFile += cbRead;
+
+        return True;
+
 
 class TestDir(TestFsObj):
@@ -440 +476 @@
                         return oDir;
                     oParent = oParent.oParent;
+        return None; # make pylint happy
 
 #