ajack 2004/01/09 15:41:41
Modified: python/gump/test pyunit.py
python/gump/model stats.py
Log:
If at second...
Revision Changes Path
1.17 +11 -8 jakarta-gump/python/gump/test/pyunit.py
Index: pyunit.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/pyunit.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pyunit.py 9 Jan 2004 23:28:40 -0000 1.16
+++ pyunit.py 9 Jan 2004 23:41:41 -0000 1.17
@@ -79,8 +79,9 @@
def raiseIssue(self, stuff):
message=''
for s in stuff:
+ message += '['
message += str(s)
- message += '. '
+ message += '] '
raise RuntimeError, message
@@ -118,16 +119,18 @@
self.raiseIssue(['Ought evaluate as in', message, object, sequence])
def assertSubstring(self,message,subString,mainString):
- if not -1 == mainString.find(subString):
- self.raiseIssue(['Ought evaluate as in', message, object, sequence])
+ if -1 == mainString.find(subString):
+ self.raiseIssue(['Ought evaluate as a substring', \
+ message, subString, mainString, mainString.find(subString)])
def assertNotIn(self,message,object,sequence):
if object in sequence:
self.raiseIssue(['Ought NOT evaluate as in', message, object, sequence])
def assertNotSubstring(self,message,subString,mainString):
- if -1 == mainString.find(subString):
- self.raiseIssue(['Ought evaluate as in', message, object, sequence])
+ if not -1 == mainString.find(subString):
+ self.raiseIssue(['Ought NOT evaluate as a substring', \
+ message, subString, mainString, mainString.find(subString)])
def assertLengthAbove(self,message,object,length):
if not len(object) >= length:
1.6 +8 -5 jakarta-gump/python/gump/model/stats.py
Index: stats.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/stats.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- stats.py 9 Jan 2004 23:28:40 -0000 1.5
+++ stats.py 9 Jan 2004 23:41:41 -0000 1.6
@@ -143,18 +143,21 @@
elif statable.isPrereqFailed():
s.prereqs += 1
- elif statable.isFailure():
+ elif statable.isFailed():
self.failures += 1
- elif statable.isPrereq():
+ elif statable.isPrereqFailed():
self.prereqs += 1
#
# Deal with states & changes...
#
lastCurrentState=self.currentState
+
+ # Update the state to now
self.currentState=statable.getState()
+ # See if it changed, and track...
if lastCurrentState==self.currentState:
self.startOfState = default.time
self.sequenceInState += 1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
