Merge "Fixed several typos in the codebase"

This commit is contained in:
Jenkins 2014-05-22 20:53:30 +00:00 committed by Gerrit Code Review
commit 9e18eb7153
3 changed files with 5 additions and 5 deletions

View File

@ -1145,7 +1145,7 @@ class TestScheduler(testtools.TestCase):
raise Exception("Timeout waiting for Zuul to settle")
# Make sure no new events show up while we're checking
self.worker.lock.acquire()
# have all build states propogated to zuul?
# have all build states propagated to zuul?
if self.haveAllBuildsReported():
# Join ensures that the queue is empty _and_ events have been
# processed
@ -2969,10 +2969,10 @@ class TestScheduler(testtools.TestCase):
statsd = extras.try_import('statsd.statsd')
statsd.incr('test-incr')
statsd.timing('test-timing', 3)
statsd.gauge('test-guage', 12)
statsd.gauge('test-gauge', 12)
self.assertReportedStat('test-incr', '1|c')
self.assertReportedStat('test-timing', '3|ms')
self.assertReportedStat('test-guage', '12|g')
self.assertReportedStat('test-gauge', '12|g')
def test_stuck_job_cleanup(self):
"Test that pending jobs are cleaned up if removed from layout"

View File

@ -276,7 +276,7 @@ class Pipeline(object):
class ActionReporter(object):
"""An ActionReporter has a reporter and its configured paramaters"""
"""An ActionReporter has a reporter and its configured parameters"""
def __repr__(self):
return '<ActionReporter %s, %s>' % (self.reporter, self.params)

View File

@ -1114,7 +1114,7 @@ class BasePipelineManager(object):
def removeChange(self, change):
# Remove a change from the queue, probably because it has been
# superceded by another change.
# superseded by another change.
for item in self.pipeline.getAllItems():
if item.change == change:
self.log.debug("Canceling builds behind change: %s "