do not raise an exception when revision is missing, this happens when file is deleted from CVS. checkin for bhearsum, r=rhelmer, b=370238
git-svn-id: svn://10.0.0.236/trunk@220034 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -175,12 +175,7 @@ class BonsaiParser:
|
||||
return filename
|
||||
|
||||
def _getRevision(self):
|
||||
"""Returns the revision of the current <f> node"""
|
||||
rev = self.currentFileNode.getAttribute("rev")
|
||||
if rev == "":
|
||||
raise InvalidResultError("A revision was missing from a file")
|
||||
|
||||
return rev
|
||||
return self.currentFileNode.getAttribute("rev")
|
||||
|
||||
|
||||
class BonsaiPoller(base.ChangeSource):
|
||||
@@ -215,7 +210,8 @@ class BonsaiPoller(base.ChangeSource):
|
||||
@param cvsroot: The cvsroot of the repository. Usually this is
|
||||
'/cvsroot'
|
||||
@type pollInterval: int
|
||||
@param pollInterval: The time (in seconds) between queries for changes
|
||||
@param pollInterval: The time (in seconds) between queries for
|
||||
changes
|
||||
"""
|
||||
|
||||
self.bonsaiURL = bonsaiURL
|
||||
|
||||
@@ -74,9 +74,6 @@ badUnparsedResult = badUnparsedResult.replace("</queryResults>", "")
|
||||
invalidDateResult = deepcopy(goodUnparsedResult)
|
||||
invalidDateResult = invalidDateResult.replace(str(date1), "foobar")
|
||||
|
||||
missingRevisionResult = deepcopy(goodUnparsedResult)
|
||||
missingRevisionResult = missingRevisionResult.replace("rev=\""+rev3+"\"", "")
|
||||
|
||||
missingFilenameResult = deepcopy(goodUnparsedResult)
|
||||
missingFilenameResult = missingFilenameResult.replace(file2, "")
|
||||
|
||||
@@ -138,13 +135,6 @@ class TestBonsaiPoller(unittest.TestCase):
|
||||
except InvalidResultError:
|
||||
pass
|
||||
|
||||
def testMissingRevisionResult(self):
|
||||
try:
|
||||
BonsaiParser(StringIO(missingRevisionResult))
|
||||
self.fail(badResultMsgs["missingRevisionResult"])
|
||||
except InvalidResultError:
|
||||
pass
|
||||
|
||||
def testMissingFilenameResult(self):
|
||||
try:
|
||||
BonsaiParser(StringIO(missingFilenameResult))
|
||||
|
||||
Reference in New Issue
Block a user