Changeset 84482 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py (modified) (1 diff)

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: