Skip to content

Commit

Permalink
Replaced tabs (ew\!) in Python code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolas17
nicolas17 committed Jul 11, 2009
1 parent c7a38d3 commit 515ea72
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 110 deletions.
12 changes: 6 additions & 6 deletions buildbot/changes/bonsaipoller.py
View file
Expand Up @@ -38,12 +38,12 @@ def __cmp__(self, other):
or len(self.nodes[i].files) != len(other.nodes[i].files):
return -1

for j in range(len(self.nodes[i].files)):
if self.nodes[i].files[j].revision \
!= other.nodes[i].files[j].revision \
or self.nodes[i].files[j].filename \
!= other.nodes[i].files[j].filename:
return -1
for j in range(len(self.nodes[i].files)):
if self.nodes[i].files[j].revision \
!= other.nodes[i].files[j].revision \
or self.nodes[i].files[j].filename \
!= other.nodes[i].files[j].filename:
return -1

return 0

Expand Down
26 changes: 13 additions & 13 deletions buildbot/changes/svnpoller.py
View file
Expand Up @@ -164,13 +164,13 @@ def __init__(self, svnurl, split_file=None,
@param svnbin: path to svn binary, defaults to just 'svn'. Use
this if your subversion command lives in an
unusual location.
@type revlinktmpl: string
@param revlinktmpl: A format string to use for hyperlinks to revision
information. For example, setting this to
"http://reposerver/websvn/revision.php?rev=%s"
would create suitable links on the build pages
to information in websvn on each revision.
@type revlinktmpl: string
@param revlinktmpl: A format string to use for hyperlinks to revision
information. For example, setting this to
"http://reposerver/websvn/revision.php?rev=%s"
would create suitable links on the build pages
to information in websvn on each revision.
"""

if svnurl.endswith("/"):
Expand All @@ -180,7 +180,7 @@ def __init__(self, svnurl, split_file=None,
self.svnuser = svnuser
self.svnpasswd = svnpasswd

self.revlinktmpl = revlinktmpl
self.revlinktmpl = revlinktmpl

self.svnbin = svnbin
self.pollinterval = pollinterval
Expand Down Expand Up @@ -400,11 +400,11 @@ def create_changes(self, new_logentries):
branch_files = [] # get oldest change first
revision = str(el.getAttribute("revision"))

revlink=''
revlink=''

if self.revlinktmpl:
if revision:
revlink = self.revlinktmpl % urllib.quote_plus(revision)
if self.revlinktmpl:
if revision:
revlink = self.revlinktmpl % urllib.quote_plus(revision)

dbgMsg("Adding change revision %s" % (revision,))
# TODO: the rest of buildbot may not be ready for unicode 'who'
Expand Down Expand Up @@ -457,7 +457,7 @@ def create_changes(self, new_logentries):
comments=comments,
revision=revision,
branch=branch,
revlink=revlink)
revlink=revlink)
changes.append(c)

return changes
Expand Down
2 changes: 1 addition & 1 deletion buildbot/status/builder.py
View file
Expand Up @@ -777,7 +777,7 @@ def getURLs(self):
return self.urls.copy()

def isStarted(self):
return (self.started is not None)
return (self.started is not None)

def isFinished(self):
return (self.finished is not None)
Expand Down
4 changes: 2 additions & 2 deletions buildbot/status/words.py
View file
Expand Up @@ -70,7 +70,7 @@ def __init__(self, channel):
self.channel = channel
self.notify_events = {}
self.subscribed = 0
self.add_notification_events(channel.notify_events)
self.add_notification_events(channel.notify_events)

silly = {
"What happen ?": "Somebody set up us the bomb.",
Expand Down Expand Up @@ -781,7 +781,7 @@ def __init__(self, nickname, password, channels, categories, notify_events):
self.password = password
self.channels = channels
self.categories = categories
self.notify_events = notify_events
self.notify_events = notify_events

def __getstate__(self):
d = self.__dict__.copy()
Expand Down
2 changes: 1 addition & 1 deletion buildbot/steps/trigger.py
View file
Expand Up @@ -54,7 +54,7 @@ def __init__(self, schedulerNames=[], updateSourceStamp=True,
self.addFactoryArguments(schedulerNames=schedulerNames,
updateSourceStamp=updateSourceStamp,
waitForFinish=waitForFinish,
set_properties=set_properties,
set_properties=set_properties,
copy_properties=copy_properties)

def interrupt(self, reason):
Expand Down
174 changes: 87 additions & 87 deletions buildbot/test/test_transfer.py
View file
Expand Up @@ -458,22 +458,22 @@ def testSuccess(self):
"build",
"source_dir")
dircount = 5
content = []
content.append("this is one source file\n" * 1000)
content.append("this is a second source file\n" * 978)
content.append("this is a third source file\n" * 473)
content = []
content.append("this is one source file\n" * 1000)
content.append("this is a second source file\n" * 978)
content.append("this is a third source file\n" * 473)
os.mkdir(slavesrc)
for i in range(dircount):
os.mkdir(os.path.join(slavesrc, "d%i" % (i)))
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))
for h in range(3):
for i in range(dircount):
os.mkdir(os.path.join(slavesrc, "d%i" % (i)))
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))
for h in range(3):
open(os.path.join(slavesrc, curdir, "file%i" % (h)), "w").write(content[h])
for j in range(dircount):
#empty dirs, must be uploaded too
curdir = os.path.join("d%i" % (i), "f%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))
for j in range(dircount):
#empty dirs, must be uploaded too
curdir = os.path.join("d%i" % (i), "f%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))

d = self.runStep(step)
def _checkUpload(results):
Expand All @@ -483,17 +483,17 @@ def _checkUpload(results):
# logtext = l[0].getText()
# print logtext
self.failUnlessEqual(results, SUCCESS)
self.failUnless(os.path.exists(masterdest))
self.failUnless(os.path.exists(masterdest))
for i in range(dircount):
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
self.failUnless(os.path.exists(os.path.join(masterdest, curdir)))
for h in range(3):
masterdest_contents = open(os.path.join(masterdest, curdir, "file%i" % (h)), "r").read()
self.failUnlessEqual(masterdest_contents, content[h])
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "f%i" % (j))
self.failUnless(os.path.exists(os.path.join(masterdest, curdir)))
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
self.failUnless(os.path.exists(os.path.join(masterdest, curdir)))
for h in range(3):
masterdest_contents = open(os.path.join(masterdest, curdir, "file%i" % (h)), "r").read()
self.failUnlessEqual(masterdest_contents, content[h])
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "f%i" % (j))
self.failUnless(os.path.exists(os.path.join(masterdest, curdir)))
d.addCallback(_checkUpload)
return d

Expand Down Expand Up @@ -525,7 +525,7 @@ def _checkUpload(results):
# logtext = l[0].getText()
# print logtext
self.failUnlessEqual(results, SUCCESS)
self.failUnless(os.path.exists(masterdest))
self.failUnless(os.path.exists(masterdest))
d.addCallback(_checkUpload)
return d

Expand All @@ -548,14 +548,14 @@ def testManyEmptyDirs(self):
"build",
"source_dir")
dircount = 25
os.mkdir(slavesrc)
for i in range(dircount):
os.mkdir(os.path.join(slavesrc, "d%i" % (i)))
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))
curdir = os.path.join("d%i" % (i), "f%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))
os.mkdir(slavesrc)
for i in range(dircount):
os.mkdir(os.path.join(slavesrc, "d%i" % (i)))
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))
curdir = os.path.join("d%i" % (i), "f%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))

d = self.runStep(step)
def _checkUpload(results):
Expand All @@ -565,13 +565,13 @@ def _checkUpload(results):
# logtext = l[0].getText()
# print logtext
self.failUnlessEqual(results, SUCCESS)
self.failUnless(os.path.exists(masterdest))
for i in range(dircount):
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
self.failUnless(os.path.exists(os.path.join(masterdest, curdir)))
curdir = os.path.join("d%i" % (i), "f%i" % (j))
self.failUnless(os.path.exists(os.path.join(masterdest, curdir)))
self.failUnless(os.path.exists(masterdest))
for i in range(dircount):
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
self.failUnless(os.path.exists(os.path.join(masterdest, curdir)))
curdir = os.path.join("d%i" % (i), "f%i" % (j))
self.failUnless(os.path.exists(os.path.join(masterdest, curdir)))
d.addCallback(_checkUpload)
return d

Expand All @@ -594,8 +594,8 @@ def testOneDirOneFile(self):
"build",
"source_dir")
os.mkdir(slavesrc)
content = "this is one source file\n" * 1000
open(os.path.join(slavesrc, "srcfile"), "w").write(content)
content = "this is one source file\n" * 1000
open(os.path.join(slavesrc, "srcfile"), "w").write(content)

d = self.runStep(step)
def _checkUpload(results):
Expand All @@ -605,9 +605,9 @@ def _checkUpload(results):
# logtext = l[0].getText()
# print logtext
self.failUnlessEqual(results, SUCCESS)
self.failUnless(os.path.exists(masterdest))
masterdest_contents = open(os.path.join(masterdest, "srcfile"), "r").read()
self.failUnlessEqual(masterdest_contents, content)
self.failUnless(os.path.exists(masterdest))
masterdest_contents = open(os.path.join(masterdest, "srcfile"), "r").read()
self.failUnlessEqual(masterdest_contents, content)
d.addCallback(_checkUpload)
return d

Expand All @@ -630,14 +630,14 @@ def testOneDirManyFiles(self):
"build",
"source_dir")
filecount = 20
os.mkdir(slavesrc)
content = []
content.append("this is one source file\n" * 1000)
content.append("this is a second source file\n" * 978)
content.append("this is a third source file\n" * 473)
for i in range(3):
for j in range(filecount):
open(os.path.join(slavesrc, "srcfile%i_%i" % (i, j)), "w").write(content[i])
os.mkdir(slavesrc)
content = []
content.append("this is one source file\n" * 1000)
content.append("this is a second source file\n" * 978)
content.append("this is a third source file\n" * 473)
for i in range(3):
for j in range(filecount):
open(os.path.join(slavesrc, "srcfile%i_%i" % (i, j)), "w").write(content[i])

d = self.runStep(step)
def _checkUpload(results):
Expand All @@ -647,11 +647,11 @@ def _checkUpload(results):
# logtext = l[0].getText()
# print logtext
self.failUnlessEqual(results, SUCCESS)
self.failUnless(os.path.exists(masterdest))
for i in range(3):
for j in range(filecount):
masterdest_contents = open(os.path.join(masterdest, "srcfile%i_%i" % (i, j)), "r").read()
self.failUnlessEqual(masterdest_contents, content[i])
self.failUnless(os.path.exists(masterdest))
for i in range(3):
for j in range(filecount):
masterdest_contents = open(os.path.join(masterdest, "srcfile%i_%i" % (i, j)), "r").read()
self.failUnlessEqual(masterdest_contents, content[i])
d.addCallback(_checkUpload)
return d

Expand All @@ -673,26 +673,26 @@ def testManyDirsManyFiles(self):
self.slavebuilderbase,
"build",
"source_dir")
dircount = 10
os.mkdir(slavesrc)
for i in range(dircount):
os.mkdir(os.path.join(slavesrc, "d%i" % (i)))
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))
curdir = os.path.join("d%i" % (i), "f%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))

filecount = 5
content = []
content.append("this is one source file\n" * 1000)
content.append("this is a second source file\n" * 978)
content.append("this is a third source file\n" * 473)
for i in range(dircount):
for j in range(dircount):
for k in range(3):
for l in range(filecount):
open(os.path.join(slavesrc, "d%i" % (i), "e%i" % (j), "srcfile%i_%i" % (k, l)), "w").write(content[k])
dircount = 10
os.mkdir(slavesrc)
for i in range(dircount):
os.mkdir(os.path.join(slavesrc, "d%i" % (i)))
for j in range(dircount):
curdir = os.path.join("d%i" % (i), "e%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))
curdir = os.path.join("d%i" % (i), "f%i" % (j))
os.mkdir(os.path.join(slavesrc, curdir))

filecount = 5
content = []
content.append("this is one source file\n" * 1000)
content.append("this is a second source file\n" * 978)
content.append("this is a third source file\n" * 473)
for i in range(dircount):
for j in range(dircount):
for k in range(3):
for l in range(filecount):
open(os.path.join(slavesrc, "d%i" % (i), "e%i" % (j), "srcfile%i_%i" % (k, l)), "w").write(content[k])

d = self.runStep(step)
def _checkUpload(results):
Expand All @@ -702,13 +702,13 @@ def _checkUpload(results):
# logtext = l[0].getText()
# print logtext
self.failUnlessEqual(results, SUCCESS)
self.failUnless(os.path.exists(masterdest))
for i in range(dircount):
for j in range(dircount):
for k in range(3):
for l in range(filecount):
masterdest_contents = open(os.path.join(masterdest, "d%i" % (i), "e%i" % (j), "srcfile%i_%i" % (k, l)), "r").read()
self.failUnlessEqual(masterdest_contents, content[k])
self.failUnless(os.path.exists(masterdest))
for i in range(dircount):
for j in range(dircount):
for k in range(3):
for l in range(filecount):
masterdest_contents = open(os.path.join(masterdest, "d%i" % (i), "e%i" % (j), "srcfile%i_%i" % (k, l)), "r").read()
self.failUnlessEqual(masterdest_contents, content[k])
d.addCallback(_checkUpload)
return d

Expand All @@ -731,15 +731,15 @@ def testBigFile(self):
self.slavebuilderbase,
"build",
"source_dir")
content = 'x' * 1024*1024*8
content = 'x' * 1024*1024*8
os.mkdir(slavesrc)
open(os.path.join(slavesrc, "file"), "w").write(content)

d = self.runStep(step)
def _checkUpload(results):
step_status = step.step_status
self.failUnlessEqual(results, SUCCESS)
self.failUnless(os.path.exists(masterdest))
self.failUnless(os.path.exists(masterdest))
masterdest_contents = open(os.path.join(masterdest, "file"), "r").read()
self.failUnlessEqual(masterdest_contents, content)
d.addCallback(_checkUpload)
Expand Down

0 comments on commit 515ea72

Please sign in to comment.