Changeset 70504 in vbox

Timestamp:

Jan 10, 2018 10:54:38 AM (7 years ago)

Author:

vboxsync

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

120127

Message:

testdriver/vbox.py: Changed txsCdWait to look for valkit.txt. This should cause trouble wrt namespace morphing by the ISO maker.

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (4 diffs)

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

@@ -3279 +3279 @@
                   oTxsSession,          # type: txsclient.Session
                   cMsTimeout = 30000,   # type: int
-                  asFiles = None        # type: list(String)
+                  sFile = None          # type: String
                   ):                    # -> bool
         """
@@ -3291 +3291 @@
         """
 
-        if asFiles is None:
-            asFiles = [ 'vboxtxs-readme.txt', 'vboxtxsreadme.txt' ];
+        if sFile is None:
+            sFile = 'valkit.txt';
         fRemoveVm   = self.addTask(oSession);
         fRemoveTxs  = self.addTask(oTxsSession);
@@ -3298 +3298 @@
         msStart     = base.timestampMilli();
         cMsTimeout2 = cMsTimeout;
-        iFile       = 0;
-        fRc         = oTxsSession.asyncIsFile('${CDROM}/%s' % (asFiles[iFile],), cMsTimeout2);
+        fRc         = oTxsSession.asyncIsFile('${CDROM}/%s' % (sFile,), cMsTimeout2);
         if fRc is True:
             while True:
@@ -3332 +3331 @@
                 if cMsTimeout2 < 500:
                     cMsTimeout2 = 500;
-                iFile = (iFile + 1) % len(asFiles);
-                fRc = oTxsSession.asyncIsFile('${CDROM}/%s' % (asFiles[iFile]), cMsTimeout2);
+                fRc = oTxsSession.asyncIsFile('${CDROM}/%s' % (sFile,), cMsTimeout2);
                 if fRc is not True:
                     reporter.error('txsCdWait: asyncIsFile failed');