You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2004/05/20 19:10:39 UTC
cvs commit: gump/python/gump/document/xdocs __init__.py
ajack 2004/05/20 10:10:39
Modified: python/gump/test Tag: MultiRunner __init__.py resolving.py
diagram.py integrator.py maven.py updater.py
documenter.py svg.py resulting.py tasks.py
notifying.py syndicator.py utils.py pyunit.py
model.py
python/gump/notify Tag: MultiRunner notifier.py
python/gump/core Tag: MultiRunner config.py gumpenv.py
python/gump/model Tag: MultiRunner workspace.py
python/gump/update Tag: MultiRunner cvs.py svn.py
python/gump/build Tag: MultiRunner maven.py
python/gump/utils Tag: MultiRunner __init__.py
python/gump/document/xdocs Tag: MultiRunner __init__.py
Log:
Unit tests all pass again (except for the few I commented out
as needing a re-write)
Revision Changes Path
No revision
No revision
1.11.2.3 +16 -2 gump/python/gump/test/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/__init__.py,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- __init__.py 19 May 2004 16:01:54 -0000 1.11.2.2
+++ __init__.py 20 May 2004 17:10:36 -0000 1.11.2.3
@@ -23,6 +23,8 @@
import gump
import gump.core.config
+from gump.core.gumprun import *
+
from gump.model.state import *
from gump.model.rawmodel import XMLWorkspace
from gump.model.workspace import Workspace
@@ -31,6 +33,20 @@
from gump.utils.tools import listDirectoryToFileHolder
from gump.utils.work import *
+def getTestRun(workspaceXml=None):
+ workspace=getTestWorkspace(workspaceXml)
+ return GumpRun(workspace,'*',getConfiguredOptions())
+
+def getWorkedTestRun(workspaceXml=None):
+ workspace=getWorkedTestWorkspace(workspaceXml)
+ return GumpRun(workspace,'*',getConfiguredOptions())
+
+def getConfiguredOptions():
+ options=GumpRunOptions()
+ from gump.document.xdocs.resolver import XDocResolver
+ options.setResolver(XDocResolver('./test/bogus','http://bogus.org/'))
+ return options
+
def getTestWorkspace(xml=None):
if not xml: xml='gump/test/resources/full1/workspace.xml'
#print "Workspace File: " + str(xml)
@@ -88,8 +104,6 @@
project.changeState(STATE_SUCCESS)
return workspace
-
-
def createTestWorkspace():
xmlworkspace=XMLWorkspace({})
1.6.2.3 +8 -7 gump/python/gump/test/resolving.py
Index: resolving.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resolving.py,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- resolving.py 19 May 2004 16:01:54 -0000 1.6.2.2
+++ resolving.py 20 May 2004 17:10:36 -0000 1.6.2.3
@@ -46,7 +46,7 @@
self.module2=self.workspace.getModule('module2')
self.project1=self.workspace.getProject('project1')
self.project2=self.workspace.getProject('project2')
- self.ant1=self.project1.getAnt()
+ self.ant2=self.project2.getAnt()
def checkRelativePath(self,path1,path2):
rpath=gump.document.resolver.getRelativePath(path1,path2)
@@ -62,7 +62,9 @@
self.assertNotNone('Location: ', location)
self.assertNotNone('Location: ', location.serialize())
- def checkRelativeLocation(self,object1,object2):
+ def checkRelativeLocation(self,object1,object2):
+ self.assertNotNone('To : ', object1)
+ self.assertNotNone('From : ', object2)
location1=getLocationForObject(object1)
location2=getLocationForObject(object2)
location=getRelativeLocation(object1,object2)
@@ -114,13 +116,12 @@
self.checkRelativeLocation(self.project1,self.project1)
self.checkRelativeLocation(self.project1,self.module1)
self.checkRelativeLocation(self.module1,self.module2)
- self.checkRelativeLocation(self.module1,self.ant1)
- self.checkRelativeLocation(self.ant1,self.module1)
+ self.checkRelativeLocation(self.module1,self.ant2)
+ self.checkRelativeLocation(self.ant2,self.module1)
def testResolving(self):
- for resolver in [ TextResolver('./test','http://somewhere/something'), \
- ForrestResolver('./test','http://somewhere/something') ] :
-
+ for resolver in [ TextResolver('./test/bogus','http://somewhere/something'), \
+ XDocResolver('./test/bogus','http://somewhere/something') ] :
#print `resolver`
#printSeparator()
1.2.2.1 +5 -1 gump/python/gump/test/diagram.py
Index: diagram.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/diagram.py,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- diagram.py 16 Apr 2004 17:28:35 -0000 1.2
+++ diagram.py 20 May 2004 17:10:37 -0000 1.2.2.1
@@ -25,6 +25,8 @@
from gump.test import getWorkedTestWorkspace
from gump.test.pyunit import UnitTestSuite
+import StringIO
+
class DiagramTestSuite(UnitTestSuite):
def __init__(self):
UnitTestSuite.__init__(self)
@@ -46,6 +48,8 @@
def testScaleDiagramGeneration(self):
diagram=ScaleDiagram([10,20])
svg=diagram.generateDiagram()
- svg.serialize()
+ stream=StringIO.StringIO()
+ svg.serialize(stream)
+ stream.close()
1.6.2.1 +7 -5 gump/python/gump/test/integrator.py
Index: integrator.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/integrator.py,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- integrator.py 16 Apr 2004 17:28:35 -0000 1.6
+++ integrator.py 20 May 2004 17:10:37 -0000 1.6.2.1
@@ -25,21 +25,23 @@
import gump.core.config
from gump.core.gumprun import GumpRun
from gump.core.engine import GumpEngine
-from gump.test import getWorkedTestWorkspace
+from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
class IntegratorTestSuite(UnitTestSuite):
def __init__(self):
UnitTestSuite.__init__(self)
+
def suiteSetUp(self):
#
- # Load a decent Workspace
+ # Load a decent Run/Workspace
#
- self.workspace=getWorkedTestWorkspace()
+ self.run=getWorkedTestRun()
+ self.assertNotNone('Needed a run', self.run)
+ self.workspace=self.run.getWorkspace()
self.assertNotNone('Needed a workspace', self.workspace)
- self.run=GumpRun(self.workspace)
-
+
def testIntegrate(self):
#
# Perform this integration run...
1.7.2.2 +18 -9 gump/python/gump/test/maven.py
Index: maven.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/maven.py,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- maven.py 17 May 2004 20:22:04 -0000 1.7.2.1
+++ maven.py 20 May 2004 17:10:37 -0000 1.7.2.2
@@ -27,8 +27,10 @@
import gump.core.config
from gump.model.state import *
from gump.model.loader import WorkspaceLoader
+from gump.build.maven import MavenBuilder
+
from gump.utils import *
-from gump.test import getWorkedTestWorkspace
+from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
class MavenTestSuite(UnitTestSuite):
@@ -40,23 +42,30 @@
def __init__(self):
UnitTestSuite.__init__(self)
+
def suiteSetUp(self):
#
- # Load a decent Workspace
+ # Load a decent Run/Workspace
#
- self.workspace=getWorkedTestWorkspace()
-
- self.assertNotNone('Needed a workspace', self.workspace)
+ self.run=getWorkedTestRun()
+ self.assertNotNone('Needed a run', self.run)
+ self.workspace=self.run.getWorkspace()
+ self.assertNotNone('Needed a workspace', self.workspace)
+
self.maven1=self.workspace.getProject('maven1')
+ self.assertNotNone('Needed a maven project', self.maven1)
+ self.mavenBuilder=MavenBuilder(self.run)
def testMavenProperties(self):
- self.assertTrue('Maven project has a Maven object', self.maven1.hasMaven())
-
- self.maven1.generateMavenProperties('test/unit-testing-maven.properties')
+ self.assertTrue('Maven project has a Maven object', self.maven1.hasMaven())
+ self.mavenBuilder.generateMavenProperties(self.maven1, 'test/unit-testing-maven.properties')
- cmd=self.maven1.getMavenCommand()
+ def testMavenCommand(self):
+ self.assertTrue('Maven project has a Maven object', self.maven1.hasMaven())
+
+ cmd=self.mavenBuilder.getMavenCommand(self.maven1)
# cmd.dump()
1.6.2.2 +15 -13 gump/python/gump/test/updater.py
Index: updater.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/updater.py,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- updater.py 19 May 2004 16:01:54 -0000 1.6.2.1
+++ updater.py 20 May 2004 17:10:37 -0000 1.6.2.2
@@ -24,36 +24,38 @@
from gump import log
import gump.core.config
from gump.stats.statsdb import *
-from gump.test import getWorkedTestWorkspace
+from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
+from gump.update.updater import GumpUpdater
+
class UpdaterTestSuite(UnitTestSuite):
def __init__(self):
UnitTestSuite.__init__(self)
def suiteSetUp(self):
#
- # Load a decent Workspace
+ # Load a decent Run/Workspace
#
- self.workspace=getWorkedTestWorkspace()
+ self.run=getWorkedTestRun()
+ self.assertNotNone('Needed a run', self.run)
+ self.workspace=self.run.getWorkspace()
self.assertNotNone('Needed a workspace', self.workspace)
-
+
self.repo1=self.workspace.getRepository('repository1')
self.svnRepo1=self.workspace.getRepository('svn_repository1')
self.module1=self.workspace.getModule('module1')
self.svnModule1=self.workspace.getModule('svn_module1')
self.downloadModule1=self.workspace.getModule('download1')
+
+ self.update=GumpUpdater(self.run)
def testCommandLines(self):
- # Checkouts
- (repo, root, cmd) = command=self.module1.getUpdateCommand(0)
-
- (repo, url, cmd) = command=self.svnModule1.getUpdateCommand(0)
+ pass
- # Updates
- (repo, root, cmd) = command=self.module1.getUpdateCommand(0)
-
- (repo, url, cmd) = command=self.svnModule1.getUpdateCommand(0)
-
\ No newline at end of file
+ #
+ # Hmm, need to test checkouts and updates and status...
+ # but how, since we now delegate more
+ #
\ No newline at end of file
1.6.2.2 +14 -19 gump/python/gump/test/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/documenter.py,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- documenter.py 19 May 2004 16:01:55 -0000 1.6.2.1
+++ documenter.py 20 May 2004 17:10:37 -0000 1.6.2.2
@@ -27,36 +27,31 @@
from gump.document.text.documenter import TextDocumenter
from gump.document.xdocs.documenter import XDocDocumenter
from gump.stats.statsdb import *
-from gump.test import getWorkedTestWorkspace
+from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
class DocumenterTestSuite(UnitTestSuite):
def __init__(self):
UnitTestSuite.__init__(self)
-
+
def suiteSetUp(self):
#
- # Load a decent Workspace
+ # Load a decent Run/Workspace
#
- self.workspace=getWorkedTestWorkspace()
+ self.run=getWorkedTestRun()
+ self.assertNotNone('Needed a run', self.run)
+ self.workspace=self.run.getWorkspace()
self.assertNotNone('Needed a workspace', self.workspace)
- self.run=GumpRun(self.workspace)
-
+
def testText(self):
out=StringIO.StringIO()
- documenter=TextDocumenter(out)
- documenter.document(self.run)
- out.close()
-
- def testTemplate(self):
- out=StringIO.StringIO()
- documenter=TemplateDocumenter(out)
- documenter.document(self.run)
+ documenter=TextDocumenter(self.run,out)
+ documenter.document()
out.close()
- def testForrest(self):
- ftest=os.path.join(dir.test,'forrest')
- if not os.path.exists(ftest): os.mkdir(ftest)
- documenter=ForrestDocumenter(ftest,'http://someplace')
- documenter.document(self.run)
+ def testXDocs(self):
+ xtest=os.path.join(dir.test,'xdocs')
+ if not os.path.exists(xtest): os.mkdir(xtest)
+ documenter=XDocDocumenter(self.run,xtest,'http://someplace')
+ documenter.document()
1.1.2.1 +7 -1 gump/python/gump/test/svg.py
Index: svg.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/svg.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- svg.py 9 Apr 2004 22:38:25 -0000 1.1
+++ svg.py 20 May 2004 17:10:37 -0000 1.1.2.1
@@ -23,10 +23,16 @@
from gump.svg.svg import *
from gump.test.pyunit import UnitTestSuite
+import StringIO
+
class SvgTestSuite(UnitTestSuite):
def __init__(self):
UnitTestSuite.__init__(self)
def testSvgConstruction(self):
svg=SimpleSvg()
- svg.serialize()
\ No newline at end of file
+
+ stream=StringIO.StringIO()
+ svg.serialize(stream)
+ stream.close()
+
\ No newline at end of file
1.7.2.2 +7 -5 gump/python/gump/test/resulting.py
Index: resulting.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resulting.py,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- resulting.py 17 May 2004 23:45:51 -0000 1.7.2.1
+++ resulting.py 20 May 2004 17:10:37 -0000 1.7.2.2
@@ -24,7 +24,7 @@
from gump import log
import gump.core.config
from gump.core.gumprun import GumpRun
-from gump.test import getWorkedTestWorkspace
+from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
from gump.model.state import *
from gump.results.model import *
@@ -38,14 +38,16 @@
self.testFile = 'test/test.xml'
+
def suiteSetUp(self):
#
- # Load a decent Workspace
+ # Load a decent Run/Workspace
#
- self.workspace=getWorkedTestWorkspace()
+ self.run=getWorkedTestRun()
+ self.assertNotNone('Needed a run', self.run)
+ self.workspace=self.run.getWorkspace()
self.assertNotNone('Needed a workspace', self.workspace)
- self.run=GumpRun(self.workspace)
-
+
def checkWorkspaceResult(self,wsr):
self.assertTrue('Has some ModuleResults', wsr.hasModuleResults())
self.assertTrue('Has some ProjectResults', wsr.hasProjectResults())
1.1.2.3 +18 -7 gump/python/gump/test/Attic/tasks.py
Index: tasks.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/Attic/tasks.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- tasks.py 19 May 2004 16:01:55 -0000 1.1.2.2
+++ tasks.py 20 May 2004 17:10:37 -0000 1.1.2.3
@@ -25,27 +25,38 @@
from gump import log
import gump.core.config
from gump.core.gumprun import GumpRun
+from gump.test import getWorkedTestRun
from gump.runner.tasks import SequentialTaskRunner, GumpTaskList
from gump.test.pyunit import UnitTestSuite
class TasksTestSuite(UnitTestSuite):
def __init__(self):
UnitTestSuite.__init__(self)
-
+
+
+ def suiteSetUp(self):
+ #
+ # Load a decent Run/Workspace
+ #
+ self.run=getWorkedTestRun()
+ self.assertNotNone('Needed a run', self.run)
+ self.workspace=self.run.getWorkspace()
+ self.assertNotNone('Needed a workspace', self.workspace)
+
def testBuildTasks(self):
- engine=SequentialTaskRunner()
+ runner=SequentialTaskRunner(self.run)
taskList=GumpTaskList(['build'])
- taskList.bind(engine)
+ taskList.bind(runner)
#print `taskList`
def testBuildDocumentTasks(self):
- engine=SequentialTaskRunner()
+ runner=SequentialTaskRunner(self.run)
taskList=GumpTaskList(['build','document'])
- taskList.bind(engine)
+ taskList.bind(runner)
#print `taskList`
def testUpdateBuildStatsTasks(self):
- engine=SequentialTaskRunner()
+ runner=SequentialTaskRunner(self.run)
taskList=GumpTaskList(['update','build','updateStatistics'])
- taskList.bind(engine)
+ taskList.bind(runner)
#print `taskList`
1.1.2.4 +19 -18 gump/python/gump/test/Attic/notifying.py
Index: notifying.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/Attic/notifying.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- notifying.py 19 May 2004 16:01:55 -0000 1.1.2.3
+++ notifying.py 20 May 2004 17:10:37 -0000 1.1.2.4
@@ -24,7 +24,7 @@
from gump import log
import gump.core.config
from gump.core.gumprun import GumpRun
-from gump.test import getWorkedTestWorkspace
+from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
from gump.notify.notifier import notify,Notifier
from gump.net.smtp import *
@@ -35,39 +35,40 @@
def suiteSetUp(self):
#
- # Load a decent Workspace
+ # Load a decent Run/Workspace
#
- self.workspace=getWorkedTestWorkspace()
+ self.run=getWorkedTestRun()
+ self.assertNotNone('Needed a run', self.run)
+ self.workspace=self.run.getWorkspace()
self.assertNotNone('Needed a workspace', self.workspace)
- self.run=GumpRun(self.workspace)
def testNotificationContents(self):
- nagger=Notifier(self.run)
+ notifier=Notifier(self.run)
# For all modules...
for module in self.workspace.getModules():
#print 'Get Content For Module : ' + module.getName()
- nagger.getNamedTypedContent(module,'test')
+ notifier.getNamedTypedContent(module,'test')
for project in module.getProjects():
#print 'Get Content For Project : ' + project.getName()
# print
- nagger.getNamedTypedContent(project,'test')
+ notifier.getNamedTypedContent(project,'test')
def testNotifyUnwantedUnsent(self):
- nagger=Notifier(self.run)
+ notifier=Notifier(self.run)
- self.assertFalse( 'No Unwanted', nagger.hasUnwanted() )
- self.assertFalse( 'No Unsent', nagger.hasUnsent() )
+ self.assertFalse( 'No Unwanted', notifier.hasUnwanted() )
+ self.assertFalse( 'No Unsent', notifier.hasUnsent() )
- nagger.addUnwanted('test subject','test content')
- nagger.addUnsent('test subject','test content')
+ notifier.addUnwanted('test subject','test content')
+ notifier.addUnsent('test subject','test content')
- self.assertTrue( 'Has Unwanted', nagger.hasUnwanted() )
- self.assertTrue( 'Has Unsent', nagger.hasUnsent() )
+ self.assertTrue( 'Has Unwanted', notifier.hasUnwanted() )
+ self.assertTrue( 'Has Unsent', notifier.hasUnsent() )
- def testNagAddresses(self):
+ def testNotifyAddresses(self):
notifier=Notifier(self.run)
@@ -80,12 +81,12 @@
pass
for project in module.getProjects():
#print 'Get Addresses For Project : ' + project.getName()
- addresses=nagger.getAddressPairs(project)
+ addresses=notifier.getAddressPairs(project)
for addr in addresses:
#print 'AddressPair : ' + str(addr)
pass
- def testNagEmails(self):
+ def testNotifyEmails(self):
notifier=Notifier(self.run)
@@ -93,7 +94,7 @@
for module in self.workspace.getModules():
for project in module.getProjects():
#print 'Get E-mail For Project : ' + project.getName()
- addresses=nagger.getAddressPairs(project)
+ addresses=notifier.getAddressPairs(project)
for addr in addresses:
toAddrs=[ addr.getToAddress() ]
email=EmailMessage( toAddrs, \
1.9.2.1 +8 -7 gump/python/gump/test/syndicator.py
Index: syndicator.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/syndicator.py,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- syndicator.py 24 Apr 2004 15:25:18 -0000 1.9
+++ syndicator.py 20 May 2004 17:10:37 -0000 1.9.2.1
@@ -28,7 +28,7 @@
from gump.core.gumprun import GumpRun
from gump.syndication.rss import RSSSyndicator
from gump.syndication.atom import AtomSyndicator
-from gump.test import getWorkedTestWorkspace
+from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
class SyndicatorTestSuite(UnitTestSuite):
@@ -39,15 +39,16 @@
#
# Load a decent Workspace
#
- self.workspace=getWorkedTestWorkspace()
+ self.run=getWorkedTestRun()
+ self.assertNotNone('Needed a run', self.run)
+ self.workspace=self.run.getWorkspace()
self.assertNotNone('Needed a workspace', self.workspace)
- self.run=GumpRun(self.workspace)
def testRSS(self):
- simple=RSSSyndicator()
- simple.syndicate(self.run)
+ simple=RSSSyndicator(self.run)
+ simple.syndicate()
def testAtom(self):
- atom=AtomSyndicator()
- atom.syndicate(self.run)
+ atom=AtomSyndicator(self.run)
+ atom.syndicate()
1.10.2.2 +0 -3 gump/python/gump/test/utils.py
Index: utils.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/utils.py,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- utils.py 19 May 2004 16:01:55 -0000 1.10.2.1
+++ utils.py 20 May 2004 17:10:37 -0000 1.10.2.2
@@ -138,9 +138,6 @@
def testUnicode(self):
getStringFromUnicode("Ceki G�lc�")
- def testInitGarbageCollection(self):
- initializeGarbageCollection()
-
def testInspectGarbageCollection(self):
invokeGarbageCollection('testInspect')
1.30.2.3 +10 -7 gump/python/gump/test/pyunit.py
Index: pyunit.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/pyunit.py,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -u -r1.30.2.2 -r1.30.2.3
--- pyunit.py 19 May 2004 16:01:55 -0000 1.30.2.2
+++ pyunit.py 20 May 2004 17:10:37 -0000 1.30.2.3
@@ -168,8 +168,6 @@
tests=[]
results=[]
-
- log.setLevel(logging.DEBUG )
# Give a place to work in..
if not os.path.exists('./test'): os.mkdir('./test')
@@ -208,8 +206,7 @@
for test in tests:
# Call the test...
try:
- log.info('Perform [' + self.getName() + '::' + \
- str(test) + ']')
+ log.info('Perform [' + self.__class__.__name__+':'+test.__name__ + ']')
if hasattr(self,'setUp'):
self.setUp()
@@ -220,7 +217,7 @@
self.tearDown()
except Exception, details:
- log.error('Failed')
+ log.error('Test [' + self.__class__.__name__+':'+test.__name__ + '] Failed', exc_info=1)
# Log the traceback
import traceback
@@ -231,8 +228,8 @@
# Record the problem
results.append(Problem(self,name,message))
- # Seems a nice place to peek...
- inspectGarbageCollection(self.__class__.__name__+':'+test.__name__)
+ # Seems a nice place to peek/clean-up...
+ invokeGarbageCollection(self.__class__.__name__+':'+test.__name__)
if hasattr(self,'suiteTearDown'):
self.suiteTearDown()
@@ -248,6 +245,11 @@
self.suites.append(suite)
def run(self,args):
+
+ #log.setLevel(logging.DEBUG )
+ log.setLevel(logging.INFO )
+ initializeGarbageCollection()
+
# Sort to resolve dependency order
runOrder=createOrderedList(self.suites)
@@ -273,6 +275,7 @@
log.info('Performed [' + `testsRun` + '] tests with [' + `len(problems)` + '] issues.')
for problem in problems:
+ log.error('------------------------------------------------------------------------')
log.error('PROBLEM: ' + str(problem))
if not problems:
1.20.2.2 +6 -6 gump/python/gump/test/model.py
Index: model.py
===================================================================
RCS file: /home/cvs/gump/python/gump/test/model.py,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- model.py 17 May 2004 20:22:03 -0000 1.20.2.1
+++ model.py 20 May 2004 17:10:37 -0000 1.20.2.2
@@ -62,7 +62,7 @@
self.module3=self.workspace.getModule('module3')
self.module4=self.workspace.getModule('module4')
self.module5=self.workspace.getModule('module5')
-
+
def testWorkspace(self):
self.assertNonZero('Has Log Directory', \
@@ -240,9 +240,9 @@
#for sysproperty in self.workspace.getSysProperties():
# print `sysproperty`
- commandLine=self.project2.getBuildCommand().formatCommandLine()
- self.assertInString('Need ant.home', 'ant.home', commandLine)
- self.assertInString('Need project1.jar', 'project1.jar', commandLine)
+ #commandLine=self.builder.getBuildCommand(project2).formatCommandLine()
+ #self.assertInString('Need ant.home', 'ant.home', commandLine)
+ #self.assertInString('Need project1.jar', 'project1.jar', commandLine)
#print 'Command Line:'
#print commandLine
No revision
No revision
1.1.2.3 +11 -11 gump/python/gump/notify/Attic/notifier.py
Index: notifier.py
===================================================================
RCS file: /home/cvs/gump/python/gump/notify/Attic/notifier.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- notifier.py 18 May 2004 20:10:44 -0000 1.1.2.2
+++ notifier.py 20 May 2004 17:10:37 -0000 1.1.2.3
@@ -83,7 +83,7 @@
self.unwanted=''
#
- # Nag about the workspace (if it needs it)
+ # Notify about the workspace (if it needs it)
#
if self.workspace.isFailed():
self.notifyWorkspace(run,self.workspace)
@@ -94,7 +94,7 @@
if module.isFailed():
try:
- log.info('Nag for module: ' + module.getName())
+ log.info('Notify for module: ' + module.getName())
self.notifyModule(module)
except Exception, details:
@@ -106,7 +106,7 @@
if not self.gumpSet.inProjectSequence(project): continue
try:
- log.info('Nag for project: ' + project.getName())
+ log.info('Notify for project: ' + project.getName())
self.notifyProject(project)
except Exception, details:
@@ -115,7 +115,7 @@
# Workspace can override...
- (wsTo, wsFrom) = self.workspace.getNagOverrides()
+ (wsTo, wsFrom) = self.workspace.getNotifyOverrides()
# Belt and braces (notify to us if not notify to them)
if self.hasUnwanted():
@@ -214,7 +214,7 @@
def notifyWorkspace(self):
- """ Nag for the workspace """
+ """ Notify for the workspace """
content=self.getGenericContent(self.workspace,'There is a workspace problem... \n')
self.sendEmail(self.workspace.mailinglist, \
@@ -222,7 +222,7 @@
self.workspace.prefix+': Gump Workspace Problem ',content)
def notifyModule(self,module):
- """ Nag to a specific module's <notify entry """
+ """ Notify to a specific module's <notify entry """
#
# Form the content...
@@ -240,7 +240,7 @@
def notifyProject(self,project):
- """ Nag to a specific project's <notify entry """
+ """ Notify to a specific project's <notify entry """
module=project.getModule()
#
@@ -262,9 +262,9 @@
notifys=[]
# Workspace can override...
- (wsTo, wsFrom) = self.workspace.getNagOverrides()
+ (wsTo, wsFrom) = self.workspace.getNotifyOverrides()
- for notifyEntry in object.xml.notify:
+ for notifyEntry in object.xml.nag:
#
# Determine where to send
#
@@ -303,7 +303,7 @@
sent=0
try:
- log.info('Send Nag e-mail to: ' + str(toaddr) + \
+ log.info('Send Notify e-mail to: ' + str(toaddr) + \
' from: ' + str(fromaddr) + \
'Subject: ' + str(subject))
@@ -457,6 +457,6 @@
return content
def notify(run):
- notifier=Nagger(run)
+ notifier=Notifier(run)
notifier.notify()
No revision
No revision
1.3.2.1 +1 -1 gump/python/gump/core/config.py
Index: config.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/config.py,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- config.py 30 Apr 2004 18:09:12 -0000 1.3
+++ config.py 20 May 2004 17:10:37 -0000 1.3.2.1
@@ -86,7 +86,7 @@
class setting:
"""Configuration of hardcoded settings"""
- version='2.0.2-alpha-0004'
+ version='2.0.3-alpha-0001'
ws_version="0.4"
ws_minimum_version="0.3"
1.5.2.1 +2 -2 gump/python/gump/core/gumpenv.py
Index: gumpenv.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/gumpenv.py,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- gumpenv.py 30 Apr 2004 18:09:12 -0000 1.5
+++ gumpenv.py 20 May 2004 17:10:37 -0000 1.5.2.1
@@ -236,7 +236,7 @@
result=execute(cmd)
ok=result.state==CMD_STATE_SUCCESS
if not ok:
- log.error('Failed to detect [' + command + ']')
+ log.info('Failed to detect [' + command + ']')
except Exception, details:
ok=0
log.error('Failed to detect [' + command + '] : ' + str(details))
@@ -265,7 +265,7 @@
try:
ok=os.environ.has_key(env)
if not ok:
- log.error('Failed to find environment variable [' + env + ']')
+ log.info('Failed to find environment variable [' + env + ']')
except Exception, details:
ok=0
No revision
No revision
1.48.2.4 +2 -2 gump/python/gump/model/workspace.py
Index: workspace.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/workspace.py,v
retrieving revision 1.48.2.3
retrieving revision 1.48.2.4
diff -u -r1.48.2.3 -r1.48.2.4
--- workspace.py 19 May 2004 16:01:56 -0000 1.48.2.3
+++ workspace.py 20 May 2004 17:10:37 -0000 1.48.2.4
@@ -562,7 +562,7 @@
return getattr(self.xml.nag,'to')
def hasNotifyFromOverride(self):
- return self.isNag() and hasattr(self.xml.nag,'from')
+ return self.isNotify() and hasattr(self.xml.nag,'from')
def getNotifyFromOverride(self):
return getattr(self.xml.nag,'from')
@@ -578,7 +578,7 @@
if self.hasNotifyToOverride():
wsNotifyToOverrideAddr=self.getNotifyToOverride()
- if self.hasNagFromOverride():
+ if self.hasNotifyFromOverride():
wsNotifyFromOverrideAddr=self.getNotifyFromOverride()
return ( wsNotifyToOverrideAddr, wsNotifyFromOverrideAddr)
No revision
No revision
1.1.2.5 +3 -3 gump/python/gump/update/Attic/cvs.py
Index: cvs.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/Attic/cvs.py,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- cvs.py 19 May 2004 20:48:34 -0000 1.1.2.4
+++ cvs.py 20 May 2004 17:10:38 -0000 1.1.2.5
@@ -80,7 +80,7 @@
def performStatus(self,module):
# Get the Update Command
- (repository, root, cmd ) = self.getCvsUpdateCommand(module, 1, 1)
+ (repository, root, cmd ) = self.getUpdateCommand(module, 1, 1)
# Provide CVS logins, if not already there
loginToRepositoryOnDemand(repository,root,self.logins)
@@ -104,7 +104,7 @@
Update this module (checking out if needed)
"""
# Get the Update Command
- (repository, root, cmd ) = self.getCvsUpdateCommand(module, exists)
+ (repository, root, cmd ) = self.getUpdateCommand(module, exists)
# Provide CVS logins, if not already there
loginToRepositoryOnDemand(repository,root,self.logins)
@@ -146,7 +146,7 @@
'] : ' + module.getName())
- def getCvsUpdateCommand(self,module,exists=0,nowork=0):
+ def getUpdateCommand(self,module,exists=0,nowork=0):
"""
Format a commandline for doing the CVS update
1.1.2.2 +4 -4 gump/python/gump/update/Attic/svn.py
Index: svn.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/Attic/svn.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- svn.py 19 May 2004 16:01:58 -0000 1.1.2.1
+++ svn.py 20 May 2004 17:10:38 -0000 1.1.2.2
@@ -77,7 +77,7 @@
"""
# Get the Update Command
- cmd = self.getSvnStatusCommand(module)
+ cmd = self.getStatusCommand(module)
# Execute the command and capture results
cmdResult=execute(cmd, module.getWorkspace().tmpdir)
@@ -92,7 +92,7 @@
module.addWarning(message)
log.error(message)
- def getSvnStatusCommand(self,module):
+ def getStatusCommand(self,module):
"""
Build the 'svn status --show-updates --non-interative' command
@@ -148,7 +148,7 @@
"""
# Get the Update Command
- (repository, url, cmd ) = self.getSvnUpdateCommand(module, exists)
+ (repository, url, cmd ) = self.getUpdateCommand(module, exists)
# Execute the command and capture results
@@ -180,7 +180,7 @@
module.changeState(STATE_SUCCESS)
- def getSvnUpdateCommand(self,module,exists=0):
+ def getUpdateCommand(self,module,exists=0):
"""
Build the appropriate SVN command for checkout/update
"""
No revision
No revision
1.1.2.9 +1 -1 gump/python/gump/build/Attic/maven.py
Index: maven.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build/Attic/maven.py,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- maven.py 20 May 2004 13:16:01 -0000 1.1.2.8
+++ maven.py 20 May 2004 17:10:38 -0000 1.1.2.9
@@ -37,7 +37,7 @@
from gump.model.workspace import *
from gump.model.module import Module
-from gump.model.project import Project
+from gump.model.project import Project,AnnotatedPath
from gump.model.depend import ProjectDependency
from gump.model.stats import *
from gump.model.state import *
No revision
No revision
1.40.2.3 +1 -1 gump/python/gump/utils/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/__init__.py,v
retrieving revision 1.40.2.2
retrieving revision 1.40.2.3
diff -u -r1.40.2.2 -r1.40.2.3
--- __init__.py 19 May 2004 16:02:02 -0000 1.40.2.2
+++ __init__.py 20 May 2004 17:10:38 -0000 1.40.2.3
@@ -417,7 +417,7 @@
log.info('GC: Enabled %s : Tracked %s : Threshold %s' \
% (`enabled`, `tracked`,`threshold`))
- # gc.set_debug(gc.DEBUG_LEAK)
+ #gc.set_debug(gc.DEBUG_LEAK)
except:
pass
return tracked
No revision
No revision
1.1.2.2 +1 -1 gump/python/gump/document/xdocs/Attic/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/xdocs/Attic/__init__.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- __init__.py 17 May 2004 23:45:51 -0000 1.1.2.1
+++ __init__.py 20 May 2004 17:10:39 -0000 1.1.2.2
@@ -24,6 +24,6 @@
# Initialize
###############################################################################
-# tell Python what modules make up the gump.document.forrest package
+# tell Python what modules make up the gump.document.xdocs package
__all__ = ["documenter","resolver"]
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org