Author: gnichols
Date: 2010-07-30 16:00:32 +0000 (Fri, 30 Jul 2010)
New Revision: 614
Modified:
trunk/v7/continuation.py
Log:
619773 - reboot test fails - Continuation instance has no attribute systemLogBootMarker
Modified: trunk/v7/continuation.py
===================================================================
--- trunk/v7/continuation.py 2010-07-30 15:57:56 UTC (rev 613)
+++ trunk/v7/continuation.py 2010-07-30 16:00:32 UTC (rev 614)
@@ -25,8 +25,8 @@
class Continuation(Controller):
- def __init__(self, v7Controller, environment):
- self.v7Controller = v7Controller
+ def __init__(self, environment):
+ Controller.__init__(self)
self.environment = environment
self.documentWrapper = DocumentWrapper()
self.rebootTimeLimit = 10 # minutes
@@ -44,7 +44,7 @@
timestamp.close()
# mark the log with this run time
markerName = "%s-%s" % (marker, runTimeStamp)
- syslog.syslog(self.v7Controller.getSystemLogMarker(markerName, "begin", pid=False))
+ syslog.syslog(self.getSystemLogMarker(markerName, "begin", pid=False))
def removeInitConfig(self):
chkconfig = Command("chkconfig --del v7")
@@ -65,7 +65,7 @@
if durationData.seconds > self.rebootTimeLimit*60:
print "Error: reboot took longer that %u minutes" % self.rebootTimeLimit
return False
- log = self.v7Controller.getSystemLog("%s-%s" % (marker, runTimeStamp.strip()), pid=False)
+ log = self.getSystemLog("%s-%s" % (marker, runTimeStamp.strip()), pid=False)
rebootCount = 0
for line in log.split('\n'):
if self.systemLogBootMarker in line: