You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2010/07/11 13:10:55 UTC
svn commit: r963048 - in /gump/trunk/python/gump: core/model/propagation.py
test/model.py
Author: bodewig
Date: Sun Jul 11 11:10:55 2010
New Revision: 963048
URL: http://svn.apache.org/viewvc?rev=963048&view=rev
Log:
propagation tests failed because of a bad initial state
Modified:
gump/trunk/python/gump/core/model/propagation.py
gump/trunk/python/gump/test/model.py
Modified: gump/trunk/python/gump/core/model/propagation.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/model/propagation.py?rev=963048&r1=963047&r2=963048&view=diff
==============================================================================
--- gump/trunk/python/gump/core/model/propagation.py (original)
+++ gump/trunk/python/gump/core/model/propagation.py Sun Jul 11 11:10:55 2010
@@ -33,6 +33,10 @@ class Propogatable(Stateful):
self.cause=None # Primary Cause
self.causes=[]
+ def resetState(self):
+ """ Used by Unit Tests only """
+ Stateful.setStatePair(self, StatePair())
+
def changeState(self,state,reason=REASON_UNSET,cause=None,message=None):
#
Modified: gump/trunk/python/gump/test/model.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/test/model.py?rev=963048&r1=963047&r2=963048&view=diff
==============================================================================
--- gump/trunk/python/gump/test/model.py (original)
+++ gump/trunk/python/gump/test/model.py Sun Jul 11 11:10:55 2010
@@ -67,6 +67,10 @@ class ModelTestSuite(UnitTestSuite):
self.module3=self.workspace.getModule('module3')
self.module4=self.workspace.getModule('module4')
self.module5=self.workspace.getModule('module5')
+
+ for p in [self.project1, self.project2, self.project3, self.project4,
+ self.module1, self.module2, self.module3, self.module4]:
+ p.resetState()
def suiteTearDown(self):
self.workspace=None
@@ -201,16 +205,32 @@ class ModelTestSuite(UnitTestSuite):
project3=self.project3
project4=self.project4
+ self.assertEqual('Initial state should be UNSET',
+ project1.getState(), STATE_UNSET)
+ self.assertEqual('Initial state should be UNSET',
+ project2.getState(), STATE_UNSET)
+ self.assertEqual('Initial state should be UNSET',
+ project3.getState(), STATE_UNSET)
+ self.assertEqual('Initial state should be UNSET',
+ project4.getState(), STATE_UNSET)
+
# Make one 'packaged'
- module1.changeState(STATE_COMPLETE,REASON_PACKAGE)
+ module1.changeState(STATE_COMPLETE, REASON_PACKAGE)
# Make one 'failed'
module3.changeState(STATE_FAILED)
- self.assertNotEqual('Complete State ought NOT propagate down', project1.getState(), STATE_COMPLETE)
-
- self.assertEqual('State ought propagate to here', project4.getState(), STATE_PREREQ_FAILED)
- self.assertNotEqual('State ought NOT propagate like this', project4.getState(), STATE_FAILED)
+ self.assertNotEqual('Complete State ought NOT propagate down',
+ project1.getState(), STATE_COMPLETE)
+
+ self.assertEqual('State ought propagate to here',
+ project3.getState(), STATE_FAILED)
+ self.assertEqual('project4 is a direct dependee of project3',
+ project3.hasDirectDependee(project4), True)
+ self.assertNotEqual('State ought NOT propagate like this',
+ project4.getState(), STATE_FAILED)
+ self.assertEqual('State ought propagate to here',
+ project4.getState(), STATE_PREREQ_FAILED)
def testMetadataLocations(self):
module1=self.module1