Changeset 84482 in vbox

Timestamp:

May 25, 2020 8:16:03 AM (5 years ago)

Author:

vboxsync

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

138201

Message:

Validation Kit/testdriver: Added static getGuestWinDir() and make use of it, to avoid more code duplication.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vbox.py (modified) (2 diffs)
• tests/additions/tdAddBasic1.py (modified) (1 diff)

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

@@ -2599 +2599 @@
         """
         if oTestVm.isWindows():
-            if oTestVm.sKind in ['WindowsNT4', 'WindowsNT3x',]:
-                return 'C:\\Winnt\\System32';
-            return 'C:\\Windows\\System32';
+            return oTestVm.pathJoin(TestDriver.getGuestWinDir(oTestVm), 'System32');
         if oTestVm.isOS2():
             return 'C:\\OS2\\DLL';
@@ -2617 +2615 @@
         """
         if oTestVm.isWindows():
-            if oTestVm.sKind in ['WindowsNT4', 'WindowsNT3x',]:
-                return 'C:\\Winnt\\System32';
-            return 'C:\\Windows\\System32';
+            return oTestVm.pathJoin(TestDriver.getGuestWinDir(oTestVm), 'System32');
         if oTestVm.isOS2():
             return 'C:\\OS2\\DLL'; ## @todo r=andy Not sure here.
         return sPathPrefix + "/sbin";
+
+    @staticmethod
+    def getGuestWinDir(oTestVm):
+        """
+        Helper for finding the Windows directory in the test VM that we can play around with.
+        ASSUMES that we always install Windows on drive C.
+
+        Returns the Windows directory, or an empty string when executed on a non-Windows guest (asserts).
+        """
+        sWinDir = '';
+        if oTestVm.isWindows():
+            if oTestVm.sKind in ['WindowsNT4', 'WindowsNT3x',]:
+                sWinDir = 'C:/WinNT/';
+            else:
+                sWinDir = 'C:/Windows/';
+        assert sWinDir != '', 'Retrieving Windows directory for non-Windows OS';
+        return sWinDir;
 
     @staticmethod

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

@@ -420 +420 @@
         asLogFiles = [];
         fHaveSetupApiDevLog = False;
-        if oTestVm.sKind in ('WindowsNT4',):
-            sWinDir = 'C:/WinNT/';
-        else:
-            sWinDir = 'C:/Windows/';
-            asLogFiles = [sWinDir + 'setupapi.log', sWinDir + 'setupact.log', sWinDir + 'setuperr.log'];
-
-            # Apply The SetupAPI logging level so that we also get the (most verbose) setupapi.dev.log file.
-            ## @todo !!! HACK ALERT !!! Add the value directly into the testing source image. Later.
-            fHaveSetupApiDevLog = self.txsRunTest(oTxsSession, 'Enabling setupapi.dev.log', 30 * 1000,
-                                                  'reg.exe',
-                                                  ('reg.exe', 'add',
-                                                   '"HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Setup"',
-                                                   '/v', 'LogLevel', '/t', 'REG_DWORD', '/d', '0xFF'),
-                                                   fCheckSessionStatus = True);
+        sWinDir = self.getGuestWinDir(oTestVm);
+        asLogFiles = [ oTestVm.pathJoin(sWinDir, 'setupapi.log'),
+                       oTestVm.pathJoin(sWinDir, 'setupact.log'),
+                       oTestVm.pathJoin(sWinDir, 'setuperr.log') ];
+
+        # Apply The SetupAPI logging level so that we also get the (most verbose) setupapi.dev.log file.
+        ## @todo !!! HACK ALERT !!! Add the value directly into the testing source image. Later.
+        sRegExe = oTestVm.pathJoin(self.getGuestSystemDir(oTestVm), 'reg.exe');
+        fHaveSetupApiDevLog = self.txsRunTest(oTxsSession, 'Enabling setupapi.dev.log', 30 * 1000,
+                                              sRegExe,
+                                              (sRegExe, 'add',
+                                               '"HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Setup"',
+                                               '/v', 'LogLevel', '/t', 'REG_DWORD', '/d', '0xFF'),
+                                               fCheckSessionStatus = True);
 
         for sFile in asLogFiles: