Merge lp:~fgallina/rnr-server/revno-in-preflight into lp:rnr-server

[Fabián Ezequiel Gallina]

Added bzr revno (if available) in preflight

[Matias Bordese (matiasb)]

LGTM

review: Approve

=== modified file 'requirements.txt'
--- requirements.txt	2014-01-13 11:23:34 +0000
+++ requirements.txt	2014-07-22 12:34:08 +0000
@@ -2,6 +2,7 @@
 -f https://launchpad.net/lazr.restfulclient/+download?start=10
 -f http://code.google.com/p/httplib2/downloads/list
 -f https://launchpad.net/django-pgtools/+download
+bzr
 configglue==1.0.1
 coverage
 django-openid-auth==0.2

=== modified file 'src/reviewsapp/preflight.py'
--- src/reviewsapp/preflight.py	2014-07-11 19:05:55 +0000
+++ src/reviewsapp/preflight.py	2014-07-22 12:34:08 +0000
@@ -22,6 +22,8 @@
 __metaclass__ = type
 __all__ = []
 
+import logging
+
 import launchpadlib
 import openid
 import piston.utils
@@ -33,15 +35,38 @@
 from reviewsapp.utilities import web_services
 
 
+logger = logging.getLogger(__name__)
+
+
 class RNRPreflight(Preflight):
 
-    versions = [
-        {'name': 'rnr-server', 'version': reviewsapp.__version__},
-        {'name': 'openid', 'version': openid.__version__},
-        {'name': 'launchpadlib', 'version': launchpadlib.__version__},
-        {'name': 'piston', 'version': piston.utils.__version__},
-        {'name': 'South', 'version': south.__version__},
-    ]
+    def versions(self):
+        return [
+            {'name': 'rnr-server', 'version': reviewsapp.__version__},
+            {'name': 'bzr-revno', 'version': self.get_bzr_revno()},
+            {'name': 'openid', 'version': openid.__version__},
+            {'name': 'launchpadlib', 'version': launchpadlib.__version__},
+            {'name': 'piston', 'version': piston.utils.__version__},
+            {'name': 'South', 'version': south.__version__},
+        ]
+
+    def get_bzr_revno(self):
+        """Current deployed revno (if available)."""
+        revno = None
+        try:
+            from bzrlib.errors import NotBranchError, NoWorkingTree
+            from bzrlib.workingtree import WorkingTree
+            try:
+                t = WorkingTree.open_containing(__file__)[0]
+                revno = t.branch.revno()
+            except (NotBranchError, NoWorkingTree):
+                pass
+            except Exception:
+                logger.exception(
+                    "bzrlib and branch available but revno retrieval failed.")
+        except ImportError:
+            pass
+        return revno
 
     def authenticate(self, request):
         return (request.user.is_authenticated() and

=== modified file 'src/reviewsapp/tests/test_preflight.py'
--- src/reviewsapp/tests/test_preflight.py	2013-02-28 17:56:56 +0000
+++ src/reviewsapp/tests/test_preflight.py	2014-07-22 12:34:08 +0000
@@ -25,12 +25,14 @@
 __metaclass__ = type
 __all__ = [
     'TestPreflight',
+    'TestGetBZRRevno',
 ]
 
 from mock import patch
 
 from django.contrib.auth.models import Group
 
+from reviewsapp.preflight import RNRPreflight
 from reviewsapp.tests.factory import TestCaseWithFactory
 
 
@@ -77,7 +79,46 @@
         self.assertEqual(200, response.status_code)
         libs = set([x['name'] for x in response.context[0]['versions']])
         expected = set([
-            'rnr-server', 'openid', 'Platform', 'Python', 'Django', 'piston',
-            'launchpadlib', 'South', 'preflight',
+            'rnr-server', 'bzr-revno', 'openid', 'Platform', 'Python',
+            'Django', 'piston', 'launchpadlib', 'South', 'preflight',
         ])
         self.assertEqual(expected, libs)
+
+
+class TestGetBZRRevno(TestCaseWithFactory):
+
+    def setUp(self):
+        super(TestGetBZRRevno, self).setUp()
+        self.preflight = RNRPreflight()
+
+    def test_success(self):
+        self.assertIsNotNone(self.preflight.get_bzr_revno())
+
+    def test_no_bzrlib_returns_none(self):
+        patch_name = 'bzrlib.workingtree.WorkingTree.open_containing'
+        with patch(patch_name) as mock_open_containing:
+            mock_open_containing.side_effect = ImportError
+            self.assertIsNone(self.preflight.get_bzr_revno())
+
+    def test_no_branch_returns_none(self):
+        from bzrlib.errors import NotBranchError
+        patch_name = 'bzrlib.workingtree.WorkingTree.open_containing'
+        with patch(patch_name) as mock_open_containing:
+            mock_open_containing.side_effect = NotBranchError
+            self.assertIsNone(self.preflight.get_bzr_revno())
+
+    def test_no_working_tree_returns_none(self):
+        from bzrlib.errors import NoWorkingTree
+        patch_name = 'bzrlib.workingtree.WorkingTree.open_containing'
+        with patch(patch_name) as mock_open_containing:
+            mock_open_containing.side_effect = NoWorkingTree
+            self.assertIsNone(self.preflight.get_bzr_revno())
+
+    @patch('reviewsapp.preflight.logger')
+    @patch('bzrlib.workingtree.WorkingTree.open_containing')
+    def test_bzrlib_working_tree_and_branch_but_error(
+            self, mock_open_containing, mock_logger):
+        mock_open_containing.side_effect = IOError
+        self.assertIsNone(self.preflight.get_bzr_revno())
+        mock_logger.exception.assert_called_with(
+            "bzrlib and branch available but revno retrieval failed.")