v7-commits June 2010

v7-commits@lists.stg.fedorahosted.org

1 participants
46 discussions

r544 - trunk
by gnichols＠fedoraproject.org 11 Jun '10

11 Jun '10

Author: gnichols Date: 2010-06-11 19:55:21 +0000 (Fri, 11 Jun 2010) New Revision: 544 Modified: trunk/Makefile Log: r7 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-06-11 19:54:57 UTC (rev 543) +++ trunk/Makefile 2010-06-11 19:55:21 UTC (rev 544) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.2 -V7_RELEASE := 6 +V7_RELEASE := 7 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r543 - trunk/v7
by gnichols＠fedoraproject.org 11 Jun '10

11 Jun '10

Author: gnichols Date: 2010-06-11 19:54:57 +0000 (Fri, 11 Jun 2010) New Revision: 543 Modified: trunk/v7/documentbase.py Log: 598544 - Control-C interrupt of v7 often results in broken results.xml Modified: trunk/v7/documentbase.py =================================================================== --- trunk/v7/documentbase.py 2010-06-11 02:17:59 UTC (rev 542) +++ trunk/v7/documentbase.py 2010-06-11 19:54:57 UTC (rev 543) @@ -239,8 +239,8 @@ xml.dom.ext.PrettyPrint(self.document, file) file.close() sys.exit(1) - finally: - file.close() + + file.close()

1 0

r542 - in tags: . v7-V1-2R6/v7
by gnichols＠fedoraproject.org 10 Jun '10

10 Jun '10

Author: gnichols Date: 2010-06-11 02:17:59 +0000 (Fri, 11 Jun 2010) New Revision: 542 Added: tags/v7-V1-2R6/ tags/v7-V1-2R6/v7/version.py Log: tag version Copied: tags/v7-V1-2R6 (from rev 541, trunk) Copied: tags/v7-V1-2R6/v7/version.py (from rev 335, trunk/v7/version.py) =================================================================== --- tags/v7-V1-2R6/v7/version.py (rev 0) +++ tags/v7-V1-2R6/v7/version.py 2010-06-11 02:17:59 UTC (rev 542) @@ -0,0 +1,5 @@ + +# v7/version.py is automatically-generated - DO NOT EDIT +version = '1.2' +release = '6' +rhel_version = '5'

1 0

r541 - trunk
by gnichols＠fedoraproject.org 10 Jun '10

10 Jun '10

Author: gnichols Date: 2010-06-11 02:17:00 +0000 (Fri, 11 Jun 2010) New Revision: 541 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2010-06-11 02:15:05 UTC (rev 540) +++ trunk/v7.spec.in 2010-06-11 02:17:00 UTC (rev 541) @@ -69,6 +69,12 @@ /etc/init.d/v7 %changelog +* Thu Jun 10 2010 Greg Nichols <gnichols(a)redhat.com> + +V7 1.2 R6 + + 599741 - fv_ tests fail when libvirt is installed, but libvirtd is not started + * Tue Jun 01 2010 Greg Nichols <gnichols(a)redhat.com> V7 1.2 R4

1 0

r540 - trunk/v7
by gnichols＠fedoraproject.org 10 Jun '10

10 Jun '10

Author: gnichols Date: 2010-06-11 02:15:05 +0000 (Fri, 11 Jun 2010) New Revision: 540 Modified: trunk/v7/fvtest.py Log: 599741 - fv_ tests fail when libvirt is installed, but libvirtd is not started Modified: trunk/v7/fvtest.py =================================================================== --- trunk/v7/fvtest.py 2010-06-11 00:58:30 UTC (rev 539) +++ trunk/v7/fvtest.py 2010-06-11 02:15:05 UTC (rev 540) @@ -90,6 +90,15 @@ self.guestConfigPath = os.path.join(self.environment.getKVMGuestConfigDirectory(), self.guestConfigFile) self.guestImageDirectory = self.environment.getKVMGuestImageDirectory() + # check and start libvirtd + try: + Command("chkconfig --add libvirtd").echo() + Command("service libvirtd start").echo() + print "libvirtd is running" + except V7CommandException, e: + print "Warning: libvirtd may not be running" + print e + def __isHVMCapableViaLibvirt(self): """ determine if system is FV/hvm capable, via virsh from libvirt """ virsh = Command("virsh capabilities")

1 0

r539 - trunk
by gnichols＠fedoraproject.org 10 Jun '10

10 Jun '10

Author: gnichols Date: 2010-06-11 00:58:30 +0000 (Fri, 11 Jun 2010) New Revision: 539 Modified: trunk/Makefile Log: R6 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-06-11 00:57:46 UTC (rev 538) +++ trunk/Makefile 2010-06-11 00:58:30 UTC (rev 539) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.2 -V7_RELEASE := 5 +V7_RELEASE := 6 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r538 - trunk/tests/reboot
by gnichols＠fedoraproject.org 10 Jun '10

10 Jun '10

Author: gnichols Date: 2010-06-11 00:57:46 +0000 (Fri, 11 Jun 2010) New Revision: 538 Modified: trunk/tests/reboot/reboot.py Log: 568526 - FEAT: add a reboot test Modified: trunk/tests/reboot/reboot.py =================================================================== --- trunk/tests/reboot/reboot.py 2010-06-10 15:50:04 UTC (rev 537) +++ trunk/tests/reboot/reboot.py 2010-06-11 00:57:46 UTC (rev 538) @@ -146,8 +146,21 @@ print "Error: reboot took longer that %u minutes" % self.rebootTimeLimit return False log = self.v7Controller.getSystemLog("%s-%s" % (self.Name(), runTimeStamp.strip()), pid=False) - print "Reboot log:\n---------------------------------------------------------" - print log + rebootCount = 0 + for line in log.split('\n'): + if "kernel: Linux version" in line: + print line + rebootCount += 1 + if rebootCount is 0: + print "Error: could not detect reboot" + return False + if rebootCount > 1: + print "Error: system rebooted %u times" % rebootCount + return False + + print "reboot verified" + # print "Reboot log:\n---------------------------------------------------------" + # print log except Exception, e: print "Could not verify reboot" print e

1 0

r537 - in tags: . v7-V1-2R5/v7
by gnichols＠fedoraproject.org 10 Jun '10

10 Jun '10

Author: gnichols Date: 2010-06-10 15:50:04 +0000 (Thu, 10 Jun 2010) New Revision: 537 Added: tags/v7-V1-2R5/ tags/v7-V1-2R5/v7/version.py Log: tag version Copied: tags/v7-V1-2R5 (from rev 536, trunk) Copied: tags/v7-V1-2R5/v7/version.py (from rev 335, trunk/v7/version.py) =================================================================== --- tags/v7-V1-2R5/v7/version.py (rev 0) +++ tags/v7-V1-2R5/v7/version.py 2010-06-10 15:50:04 UTC (rev 537) @@ -0,0 +1,5 @@ + +# v7/version.py is automatically-generated - DO NOT EDIT +version = '1.2' +release = '5' +rhel_version = '5'

1 0

r536 - trunk/tests/reboot
by gnichols＠fedoraproject.org 10 Jun '10

10 Jun '10

Author: gnichols Date: 2010-06-10 15:48:02 +0000 (Thu, 10 Jun 2010) New Revision: 536 Modified: trunk/tests/reboot/reboot.py Log: 568526 - FEAT: add a reboot test Modified: trunk/tests/reboot/reboot.py =================================================================== --- trunk/tests/reboot/reboot.py 2010-06-10 15:47:25 UTC (rev 535) +++ trunk/tests/reboot/reboot.py 2010-06-10 15:48:02 UTC (rev 536) @@ -21,23 +21,27 @@ from v7.command import Command, V7CommandException from v7.controller import Controller from v7.environment import Environment +from v7.documentbase import DocumentWrapper class RebootTest(Test): def __init__(self): Test.__init__(self, name="reboot") - self.interactive = True + self.interactive = False # will prompt in --mode normal, but runs ok in --mode auto self.deviceClass = DeviceClass.system self.v7Controller = Controller() self.environment = Environment() + self.documentWrapper = DocumentWrapper() # used for time utilities + self.rebootTimeLimit = 10 # minutes + self.priority = 1001 # run last def setInitConfig(self): chkconfig = Command("chkconfig --add v7") chkconfig.echo() # get a timestamo, save it theTime = time.gmtime(time.time()) - runTimeStamp = time.strftime(Constants.DATETIMEFORMAT, theTime) + runTimeStamp = self.documentWrapper.timeToString(theTime) # save it off to the side timestamp = open(os.path.join(self.environment.getDataDirectory(), "bootprint"), "w") timestamp.write(runTimeStamp + "\n") @@ -50,49 +54,55 @@ chkconfig = Command("chkconfig --del v7") chkconfig.echo() - def reboot(self): + def verifyKDump(self): # if kdump is set up, use it + print "Checking kdump configuration" + + # these checks aren't required, leaving them for diagnostic purposes kernelBootParams = Command("cat /proc/cmdline") kdump = None try: - kdump = kernelBootParams.getString(regex="crashkernel=(?P<kdump>[^\ ]+", regexGroup="kdump") - if kdump: - print "Found crashkernel=%s boot parameter - using kdump" % kdump - try: - Command("chkconfig kdump on").echo() - Command("service kdump start").echo() - except V7Exception, e: - print "Error: could not start kdump service" - print e - return False - + kernelBootParams = Command("cat /proc/cmdline") + kdump = kernelBootParams.getString(regex=".+ crashkernel=(?P<kdump>[^\ ]+)", regexGroup="kdump") + print "Found crashkernel=%s boot parameter" % kdump except: - print "Note: kdump not configured" + print "Warning: \"crashkernel\" is not set in boot parameters" + + try: + panicRebootTimeout = Command("cat /proc/sys/kernel/panic") + timeout = panicRebootTimeout.getInteger() + if timeout > 0: + print "Kernel panic reboot timeout is %u" % timeout + else: + print "Warning: Panic reboot is disabled (/proc/sys/kernel/panic is set to 0)" + except V7CommandException, e: + print "Warning: could not read /proc/sys/kernel/panic" + + print "Checking kdump service" + try: + kdump = Command("service kdump status") + kdump.getString("is operational") + print "kdump is running" + except V7CommandException, e: + print "kdump is not running - can not test it" + print e + return False + + return True - if kdump: - print "The test will now cause a kernel panic to exercise kdump" - if self.getMode() != Constants.auto: - if not self.promptConfirm("Ready to restart?"): - return False - try: - Command("echo 1 > /proc/sys/kernel/sysrq").echo() - Command("echo \"c\" > /proc/sysrq-trigger").echo() - except V7Exception, e: - print "Error: could not cause kernel panic" - print e + + def reboot(self): + print "The system must be restarted for this test" + if self.getMode() != Constants.auto: + if not self.promptConfirm("Ready to restart?"): return False - else: # reboot - print "The system must be restarted for this test" - if self.getMode() != Constants.auto: - if not self.promptConfirm("Ready to restart?"): - return False - rebootCommand = Command("shutdown -r 0") - try: - rebootCommand.echo() - except Exception, e: - print "Error: reboot failed" - print e - return False + rebootCommand = Command("shutdown -r 0") + try: + rebootCommand.echo() + except Exception, e: + print "Error: reboot failed" + print e + return False # wait here for reboot waitTime = 60 #sec @@ -101,13 +111,40 @@ print "Error: Shutdown took too long" return False + def causePanic(self): + print "The test will now cause a kernel panic to exercise kdump" + if self.getMode() != Constants.auto: + if not self.promptConfirm("Ready to restart?"): + return False + try: + Command("echo 1 > /proc/sys/kernel/sysrq").echo() + Command("echo \"c\" > /proc/sysrq-trigger").echo() + except V7CommandException, e: + print "Error: could not cause kernel panic" + print e + return False + + # wait here for panic - shouldn't ever get here + waitTime = 60 #sec + print "Waiting for panic..." + time.sleep(waitTime) + print "Error: panic did not occur?" + return False + def verifyContinuation(self): # get the log, verify rboot happened runTimeStamp = None try: timestamp = open(os.path.join(self.environment.getDataDirectory(), "bootprint")) - runTimeStamp = timestamp.readline() + runTimeStamp = timestamp.readline().strip() timestamp.close() + theTime = time.gmtime(time.time()) + duration = self.documentWrapper.duration(runTimeStamp, self.documentWrapper.timeToString(theTime)) + print "reboot took " + duration + durationData = self.documentWrapper.durationData(runTimeStamp, self.documentWrapper.timeToString(theTime)) + if durationData.seconds > self.rebootTimeLimit*60: + print "Error: reboot took longer that %u minutes" % self.rebootTimeLimit + return False log = self.v7Controller.getSystemLog("%s-%s" % (self.Name(), runTimeStamp.strip()), pid=False) print "Reboot log:\n---------------------------------------------------------" print log @@ -129,7 +166,10 @@ self.removeInitConfig() else: self.setInitConfig() - result = self.reboot() + if self.verifyKDump(): + result = self.causePanic() + else: + result = self.reboot() if result: return PASSED

1 0

r535 - trunk/v7
by gnichols＠fedoraproject.org 10 Jun '10

10 Jun '10

Author: gnichols Date: 2010-06-10 15:47:25 +0000 (Thu, 10 Jun 2010) New Revision: 535 Modified: trunk/v7/hardwaretest.py Log: 568526 - FEAT: add a reboot test Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2010-06-10 15:46:43 UTC (rev 534) +++ trunk/v7/hardwaretest.py 2010-06-10 15:47:25 UTC (rev 535) @@ -43,7 +43,6 @@ from v7.command import Command, V7CommandException from v7.resultsengine import ResultsEngine from v7.redhatrelease import RedHatRelease -from v7.daemon import V7Daemon class HardwareTestHarness(Controller): @@ -745,6 +744,12 @@ elif mandatoryTest.getMandatory() == Constants.post: requestedTests.append(mandatoryTest) + # reboot test is a special case - really needs to run last + reboot = requestedTestDict["reboot"] + if reboot: + requestedTests.remove(reboot) + requestedTests.append(reboot) + return requestedTests

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

v7-commits June 2010