Changeset 83970 in vbox for trunk/src/VBox/ValidationKit
- Timestamp:
- Apr 24, 2020 3:12:28 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py
r83966 r83970 89 89 if sText is None: 90 90 return None; 91 if isinstance(sText, buffer): 92 try: sText = str(sText); # pylint: disable=redefined-variable-type 93 except: pass; 94 if isinstance(sText, array.array): 95 try: sText = sText.tostring(); 96 except: pass; 91 92 try: sText = str(sText); # pylint: disable=redefined-variable-type 93 except: pass; 97 94 98 95 asLines = sText.splitlines(); … … 581 578 if fRc: 582 579 break; 583 else: 584 585 580 581 self.oTestDriver.sleep(10); 582 cAttempt += 1; 586 583 587 584 return fRc; … … 701 698 702 699 if fRc: 703 (fRc, _, _, _) = self.guestProcessExecute(oGuestSession, 700 (fRc, _, _, _) = self.guestProcessExecute(oGuestSession, 704 701 'Allowing execution for the vbox installer', 705 702 30 * 1000, '/usr/bin/sudo', … … 740 737 (fRc, _, _, _) = self.guestProcessExecute(oGuestSession, 'Moving to destination', 741 738 30 * 1000, '/usr/bin/sudo', 742 ['/usr/bin/sudo', '/bin/mv', '/tmp/virtualbox', '/etc/default/virtualbox'], 739 ['/usr/bin/sudo', '/bin/mv', '/tmp/virtualbox', 740 '/etc/default/virtualbox'], 743 741 False, True); 744 742 if fRc: 745 743 (fRc, _, _, _) = self.guestProcessExecute(oGuestSession, 'Setting permissions', 746 744 30 * 1000, '/usr/bin/sudo', 747 ['/usr/bin/sudo', '/bin/chmod', '644', '/etc/default/virtualbox'], 745 ['/usr/bin/sudo', '/bin/chmod', '644', 746 '/etc/default/virtualbox'], 748 747 False, True); 749 748 … … 753 752 (fRc, _, _, _) = self.guestProcessExecute(oGuestSession, 'Moving to destination', 754 753 30 * 1000, '/usr/bin/sudo', 755 ['/usr/bin/sudo', '/bin/mv', '/tmp/autostart.cfg', '/etc/vbox/autostart.cfg'], 754 ['/usr/bin/sudo', '/bin/mv', '/tmp/autostart.cfg', 755 '/etc/vbox/autostart.cfg'], 756 756 False, True); 757 757 if fRc: 758 758 (fRc, _, _, _) = self.guestProcessExecute(oGuestSession, 'Setting permissions', 759 759 30 * 1000, '/usr/bin/sudo', 760 ['/usr/bin/sudo', '/bin/chmod', '644', '/etc/vbox/autostart.cfg'], 760 ['/usr/bin/sudo', '/bin/chmod', '644', 761 '/etc/vbox/autostart.cfg'], 761 762 False, True); 762 763 fRc = self.closeSession(oGuestSession, True) and fRc and True; # pychecker hack. … … 773 774 (fRc, _, _, _) = self.guestProcessExecute(oGuestSession, 'Creating new user', 774 775 30 * 1000, '/usr/bin/sudo', 775 ['/usr/bin/sudo', '/usr/sbin/useradd', '-m', '-U', sUser], False, True); 776 ['/usr/bin/sudo', '/usr/sbin/useradd', '-m', '-U', 777 sUser], False, True); 776 778 fRc = self.closeSession(oGuestSession, True) and fRc and True; # pychecker hack. 777 779 return fRc; … … 895 897 if fRc: 896 898 break; 897 else: 898 899 899 900 self.oTestDriver.sleep(10); 901 cAttempt += 1; 900 902 901 903 return fRc; … … 1230 1232 return rc; 1231 1233 1232 def parseOption(self, asArgs, iArg): 1234 def parseOption(self, asArgs, iArg): # pylint: disable=too-many-branches,too-many-statements 1233 1235 if asArgs[iArg] == '--test-build-dir': 1234 1236 iArg += 1; … … 1366 1368 oGuestOsHlp = None # type: tdAutostartOs 1367 1369 if sVmName == self.ksOsLinux: 1368 oGuestOsHlp = tdAutostartOsLinux(self, self.sTestBuildDir, self.fpApiVer, self.sGuestAdditionsIso); # pylint: disable=redefined-variable-type 1370 oGuestOsHlp = tdAutostartOsLinux(self, self.sTestBuildDir, self.fpApiVer, 1371 self.sGuestAdditionsIso); # pylint: disable=redefined-variable-type 1369 1372 elif sVmName == self.ksOsSolaris: 1370 oGuestOsHlp = tdAutostartOsSolaris(self, self.sTestBuildDir, self.fpApiVer, self.sGuestAdditionsIso); # pylint: disable=redefined-variable-type 1373 oGuestOsHlp = tdAutostartOsSolaris(self, self.sTestBuildDir, self.fpApiVer, 1374 self.sGuestAdditionsIso); # pylint: disable=redefined-variable-type 1371 1375 elif sVmName == self.ksOsDarwin: 1372 oGuestOsHlp = tdAutostartOsDarwin(self, self.sTestBuildDir, self.fpApiVer, self.sGuestAdditionsIso); # pylint: disable=redefined-variable-type 1376 oGuestOsHlp = tdAutostartOsDarwin(self, self.sTestBuildDir, self.fpApiVer, 1377 self.sGuestAdditionsIso); # pylint: disable=redefined-variable-type 1373 1378 elif sVmName == self.ksOsWindows: 1374 oGuestOsHlp = tdAutostartOsWin(self, self.sTestBuildDir, self.fpApiVer, self.sGuestAdditionsIso); # pylint: disable=redefined-variable-type 1379 oGuestOsHlp = tdAutostartOsWin(self, self.sTestBuildDir, self.fpApiVer, 1380 self.sGuestAdditionsIso); # pylint: disable=redefined-variable-type 1375 1381 1376 1382 sTestUserAllow = 'test1';
Note:
See TracChangeset
for help on using the changeset viewer.
