Merge branch 'bug2504-1' of git://github.com/srinupiits/buildbot

buildbot · Aug 10, 2013 · dbdc329 · dbdc329
2 parents 3118974 + efd0d6a
commit dbdc329
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/master/buildbot/steps/source/git.py b/master/buildbot/steps/source/git.py
@@ -15,7 +15,7 @@
 
 from twisted.python import log
 from twisted.internet import defer, reactor
-from distutils.version import StrictVersion
+from distutils.version import LooseVersion
 
 from buildbot import config as bbconfig
 from buildbot.process import buildstep
@@ -511,7 +511,7 @@ def checkSupport(stdout):
             if 'git' in stdout:
                 gitInstalled = True
             version = stdout.strip().split(' ')[2]
-            if StrictVersion(version) < StrictVersion("1.6.5"):
+            if LooseVersion(version) < LooseVersion("1.6.5"):
                 self.supportsBranch = False
             return gitInstalled
         d.addCallback(checkSupport)

diff --git a/master/buildbot/test/unit/test_steps_source_git.py b/master/buildbot/test/unit/test_steps_source_git.py
@@ -552,6 +552,41 @@ def test_mode_incremental(self):
         self.expectProperty('got_revision', 'f6ad368298bd941e934a41f3babc827b2aa95a1d', 'Git')
         return self.runStep()
 
+    def test_version_format(self):
+        self.setupStep(
+                git.Git(repourl='http://github.com/buildbot/buildbot.git',
+                                    mode='incremental'))
+        self.expectCommands(
+            ExpectShell(workdir='wkdir',
+                        command=['git', '--version'])
+            + ExpectShell.log('stdio',
+                stdout='git version 1.7.5.1')
+            + 0,
+            Expect('stat', dict(file='wkdir/.buildbot-patched',
+                                logEnviron=True))
+            + 1,
+            Expect('stat', dict(file='wkdir/.git',
+                                logEnviron=True))
+            + 0,
+            ExpectShell(workdir='wkdir',
+                        command=['git', 'fetch', '-t',
+                                 'http://github.com/buildbot/buildbot.git',
+                                 'HEAD'])
+            + 0,
+            ExpectShell(workdir='wkdir',
+                        command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
+            + 0,
+            ExpectShell(workdir='wkdir',
+                        command=['git', 'rev-parse', 'HEAD'])
+            + ExpectShell.log('stdio',
+                stdout='f6ad368298bd941e934a41f3babc827b2aa95a1d')
+            + 0,
+
+        )
+        self.expectOutcome(result=SUCCESS, status_text=["update"])
+        self.expectProperty('got_revision', 'f6ad368298bd941e934a41f3babc827b2aa95a1d', 'Git')
+        return self.runStep()
+
     def test_mode_incremental_retry(self):
         self.setupStep(
                 git.Git(repourl='http://github.com/buildbot/buildbot.git',