gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: jakarta-gump/python/gump/document forrest.py
Date Fri, 21 Nov 2003 02:32:41 GMT
ajack       2003/11/20 18:32:41

  Modified:    python/gump/utils __init__.py
               python/gump/test pyunit.py model.py stats.py
               python/gump/test/resources/simple3 package1.xml
               python/gump/model project.py
               python/gump/document forrest.py
  Log:
  Minor doc fixes
  
  Revision  Changes    Path
  1.4       +1 -1      jakarta-gump/python/gump/utils/__init__.py
  
  Index: __init__.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/utils/__init__.py,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- __init__.py	20 Nov 2003 20:51:49 -0000	1.3
  +++ __init__.py	21 Nov 2003 02:32:41 -0000	1.4
  @@ -227,7 +227,7 @@
       return getGeneralDifferenceDescription( since, secs )
               
   def getGeneralDifferenceDescription(newerSecs,olderSecs):
  -    if not -1 == olderSecs and not olderSecs >= newerSecs:
  +    if not 0 >= olderSecs and not olderSecs >= newerSecs:
           diffString='~ '
           diffSecs=newerSecs - olderSecs
           
  
  
  
  1.6       +3 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- pyunit.py	20 Nov 2003 21:30:06 -0000	1.5
  +++ pyunit.py	21 Nov 2003 02:32:41 -0000	1.6
  @@ -215,6 +215,7 @@
                       self.tearDown()
           
               except Exception, details:
  +                log.error('Failed')    
                   import traceback
                   ei = sys.exc_info()
                   message=formatException(ei)
  @@ -245,10 +246,11 @@
               try:
                   problems += suite.performTests()
               except Exception, details:
  +                log.error('Failed')
                   import traceback
                   ei = sys.exc_info()
                   message=formatException(ei)
  -                del ei                
  +                del ei    
                   problems.append(Problem(suite,'performTests',message)) 
              
           printSeparator()
  
  
  
  1.3       +2 -0      jakarta-gump/python/gump/test/model.py
  
  Index: model.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/model.py,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- model.py	20 Nov 2003 21:30:06 -0000	1.2
  +++ model.py	21 Nov 2003 02:32:41 -0000	1.3
  @@ -94,6 +94,7 @@
           self.project3=self.workspace.getProject('project3')
           self.project4=self.workspace.getProject('project4')
           
  +        self.packagedModule1=self.workspace.getModule('package1')        
           self.module1=self.workspace.getModule('module1')
           self.module2=self.workspace.getModule('module2')
           self.module3=self.workspace.getModule('module3')
  @@ -106,6 +107,7 @@
                       
       def testPackages(self):
           self.assertTrue('Is a package', self.package1.isPackaged())
  +        self.assertTrue('Is a package', self.packagedModule1.isPackaged())
           
       def testRepository(self):
           repo1 = self.repo1
  
  
  
  1.2       +4 -2      jakarta-gump/python/gump/test/stats.py
  
  Index: stats.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/stats.py,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- stats.py	20 Nov 2003 20:51:49 -0000	1.1
  +++ stats.py	21 Nov 2003 02:32:41 -0000	1.2
  @@ -105,7 +105,9 @@
           
       def testLoadAndUpdateStats(self):
           self.statsDB.loadStatistics(self.workspace)
  -        self.statsDB.updateStatistics(self.workspace)
  +        self.statsDB.updateStatistics(self.workspace)   
           
  -        self.module1.getLastUpdated()
  +        rough=getGeneralDifferenceDescription(default.time, self.module1.getLastUpdated())
  +        self.assertNotIn('Date Diff String', 'year', rough)
  +     
           
  
  
  
  1.2       +1 -1      jakarta-gump/python/gump/test/resources/simple3/package1.xml
  
  Index: package1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/simple3/package1.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package1.xml	20 Nov 2003 20:51:49 -0000	1.1
  +++ package1.xml	21 Nov 2003 02:32:41 -0000	1.2
  @@ -1,4 +1,4 @@
  -<module name="packagedModule1">
  +<module name="package1">
   
     <url  href="http://ant.apache.org/index.html"/>
     <description>
  
  
  
  1.13      +0 -2      jakarta-gump/python/gump/model/project.py
  
  Index: project.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/model/project.py,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- project.py	21 Nov 2003 00:27:58 -0000	1.12
  +++ project.py	21 Nov 2003 02:32:41 -0000	1.13
  @@ -398,11 +398,9 @@
                   for xmldepend in badDepends:
                       self.changeState(STATE_FAILED,REASON_CONFIG_FAILED)
                       self.addError("Bad Dependency. Project: " + xmldepend.project + " unknown
to *this* workspace")
  -                    #log.error("Unknown Dependency [" + xmldepend.project + "] on [" +
self.getName()  + "]")                    
   
                   for xmloption in badOptions:                
                       self.addWarning("Bad *Optional* Dependency. Project: " + xmloption.project
+ " unknown to *this* workspace")
  -                    #log.warn("Unknown *Optional* Dependency [" + xmloption.project + "]
on [" + self.getName() + "]")   
           else:
               self.addInfo("This is a packaged project, location: " + str(self.home))
           
  
  
  
  1.11      +6 -6      jakarta-gump/python/gump/document/forrest.py
  
  Index: forrest.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- forrest.py	20 Nov 2003 21:30:06 -0000	1.10
  +++ forrest.py	21 Nov 2003 02:32:41 -0000	1.11
  @@ -614,7 +614,7 @@
           # Document the workspace XML    
           document=XDocDocument('Definition',self.resolver.getFile(workspace,'workspace.xml'))
           stream=StringIO.StringIO() 
  -        xmlize('workspace',workspace,stream)
  +        xmlize('workspace',workspace.xml,stream)
           stream.seek(0)
           document.createSource(stream.read())
           stream.close()
  @@ -1194,13 +1194,13 @@
           return icons
           
       def insertStateIcon(self,toObject,fromObject,xdocNode):
  -        return self.insertStateLink(toObject,fromObject,xdocNode,1)
  +        return self.insertLink(toObject,fromObject,xdocNode,1,1,1)
       
  -    def insertTypedLink(self,toObject,fromObject,xdocNode,state=0):
  -        return self.insertLink(toObject,fromObject,xdocNode,1,state,0)
  +    def insertTypedLink(self,toObject,fromObject,xdocNode,state=0,icon=0):
  +        return self.insertLink(toObject,fromObject,xdocNode,1,state,icon)
           
  -    def insertStateLink(self,toObject,fromObject,xdocNode,typed=0):
  -        return self.insertLink(toObject,fromObject,xdocNode,typed,1,0)
  +    def insertStateLink(self,toObject,fromObject,xdocNode,typed=0,icon=0):
  +        return self.insertLink(toObject,fromObject,xdocNode,typed,1,icon)
           
       def insertLink(self,toObject,fromObject,xdocNode,typed=0,state=0,icon=0):
           description=''
  
  
  

Mime
View raw message