Merge branch 'typos2' of git://github.com/vrutsky/buildbot

buildbot · Mar 18, 2013 · 3132b58 · 3132b58
2 parents 41e2fcd + 78e5fdf
commit 3132b58
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/master/buildbot/libvirtbuildslave.py b/master/buildbot/libvirtbuildslave.py
@@ -34,7 +34,7 @@ class WorkQueue(object):
     I am a class that turns parallel access into serial access.
 
     I exist because we want to run libvirt access in threads as we don't
-    trust calls not to block, but under load libvirt doesnt seem to like
+    trust calls not to block, but under load libvirt doesn't seem to like
     this kind of threaded use.
     """
 
@@ -272,8 +272,8 @@ def stop_instance(self, fast=False):
         """
         log.msg("Attempting to stop '%s'" % self.name)
         if self.domain is None:
-             log.msg("I don't think that domain is even running, aborting")
-             return defer.succeed(None)
+            log.msg("I don't think that domain is even running, aborting")
+            return defer.succeed(None)
 
         domain = self.domain
         self.domain = None

diff --git a/master/buildbot/process/builder.py b/master/buildbot/process/builder.py
@@ -485,7 +485,7 @@ def setExpectations(self, progress):
             # the first time we get a good build, create our Expectations
             # based upon its results
             self.expectations = Expectations(progress)
-        log.msg("new expectations: %s seconds" % \
+        log.msg("new expectations: %s seconds" %
                 self.expectations.expectedBuildTime())
 
     # Build Creation

diff --git a/master/buildbot/test/unit/test_steps_master.py b/master/buildbot/test/unit/test_steps_master.py
@@ -175,7 +175,7 @@ def test_constr_args_descriptionSuffix(self):
                                 env={'a':'b'}, path=['/usr/bin'], usePTY=True,
                                 command='true'))
 
-        # call twice to make sure the suffix doesnt get double added
+        # call twice to make sure the suffix doesn't get double added
         self.assertEqual(self.step.describe(), ['x', 'z'])
         self.assertEqual(self.step.describe(), ['x', 'z'])
 

diff --git a/master/buildbot/test/unit/test_steps_trigger.py b/master/buildbot/test/unit/test_steps_trigger.py
@@ -452,7 +452,7 @@ def test_waitForFinish_exception(self):
         self.expectTriggeredWith(
             a=({}, {}),
             b=({}, {}))
-        self.expectTriggeredLinks('a') # b doesnt return a brid
+        self.expectTriggeredLinks('a') # b doesn't return a brid
         d = self.runStep(expect_waitForFinish=True)
         def flush(_):
             self.assertEqual(len(self.flushLoggedErrors(RuntimeError)), 1)