Changeset 86558 in vbox for trunk/src/VBox

Timestamp:

Oct 13, 2020 2:20:04 PM (4 years ago)

Author:

vboxsync

Message:

Main: bugref:9341: Testcase: fixed invalid matching string in the script

File:

• trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py

@@ -1227 +1227 @@
         if fRc:
             sSecPolicyEditor = """
-$oUser = New-Object System.Security.Principal.NTAccount("%s")
+$sUser = '%s'
+$oUser = New-Object System.Security.Principal.NTAccount("$sUser")
 $oSID = $oUser.Translate([System.Security.Principal.SecurityIdentifier])
-$sExportFile = '.\\cfg.inf'
-$sSecDb = '.\\secedt.sdb'
-$sSecDb1 = '.\\secedt.jfm'
-$sImportFile = '.\\newcfg.inf'
+$sExportFile = 'C:\\Temp\\cfg.inf'
+$sSecDb = 'C:\\Temp\\secedt.sdb'
+$sImportFile = 'C:\\Temp\\newcfg.inf'
 secedit /export /cfg $sExportFile
 $sCurrServiceLogonRight = Get-Content -Path $sExportFile |
-    Where-Object -FilterScript {$PSItem -match 'SeServiceLogonRight'}
+    Where-Object {$_ -Match 'SeServiceLogonRight'}
 $asFileContent = @'
 [Unicode]
@@ -1259 +1259 @@
 Remove-Item -Path $sSecDb
 Remove-Item -Path $sImportFile
-Remove-Item -Path $sSecDb1
                            """ % (sUser,);
             fRc = self.uploadString(oGuestSession, sSecPolicyEditor, 'C:\\Temp\\adjustsec.ps1');
@@ -1267 +1266 @@
             (fRc, _, _, _) = self.guestProcessExecute(oGuestSession,
                                                       'Setting the "Logon as service" policy to the user %s' % sUser,
-                                                      60 * 1000, 'C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe',
-                                                      ['powershell.exe', '-file', 'C:\\Temp\\adjustsec.ps1', '-ExecutionPolicy',
-                                                       'Bypass' ], False, True);
+                                                      300 * 1000, 'C:\\Windows\\System32\\cmd.exe',
+                                                      ['cmd.exe', '/c', "type C:\\Temp\\adjustsec.ps1 | powershell -"],
+                                                      False, True);
             if not fRc:
                 reporter.error('Setting the "Logon as service" policy to the user %s failed' % sUser);