Merge lp:~facundo/ubuntuone-client/log-version-number into lp:ubuntuone-client

[Facundo Batista]

Log the client version at start (LP: #715455).

Log the client version at start.

Test included.

[Guillermo Gonzalez (verterok)]

review: Approve

[Facundo Batista (facundo)]

Approve with one review.

review: Approve

=== modified file 'tests/syncdaemon/test_main.py'
--- tests/syncdaemon/test_main.py	2011-02-21 20:42:06 +0000
+++ tests/syncdaemon/test_main.py	2011-04-06 17:57:23 +0000
@@ -16,17 +16,24 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """ Tests for main.Main class """
+
+import logging
 import os
 import shutil
 
 from twisted.internet import defer, reactor
 
 from ubuntuone.syncdaemon import main as main_mod
+from ubuntuone.clientdefs import VERSION
+
 from contrib.testing.testcase import (
     BaseTwistedTestCase, FAKED_CREDENTIALS,
 )
 from tests.platform import setup_main_test, get_main_params
 
+from ubuntuone.devtools.handlers import MementoHandler
+
+
 def _get_main_common_params(testcase):
     """Return the parameters used by the all platforms."""
     return dict(root_dir=testcase.root,
@@ -60,6 +67,11 @@
         # perform the extra setup steps according to the platform
         setup_main_test(self)
 
+        self.handler = MementoHandler()
+        self.handler.setLevel(logging.DEBUG)
+        self._logger = logging.getLogger('ubuntuone.SyncDaemon')
+        self._logger.addHandler(self.handler)
+
     def build_main(self, **kwargs):
         """
         Build and return a Main object, using reasonable defaults for
@@ -74,6 +86,7 @@
 
     def tearDown(self):
         """Clean up the tests."""
+        self._logger.removeHandler(self.handler)
         shutil.rmtree(self.root)
         shutil.rmtree(self.shares)
         shutil.rmtree(self.data)
@@ -289,3 +302,9 @@
 
         self.assertEqual(main.get_sharesdir_link(),
                          os.path.join(main.get_rootdir(), expected))
+
+    def test_version_is_logged(self):
+        """Test that the client version is logged."""
+        main = self.build_main()
+        self.addCleanup(lambda: main.shutdown())
+        self.assertTrue(self.handler.check_info("client version", VERSION))
 
=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2011-02-21 17:29:02 +0000
+++ ubuntuone/syncdaemon/main.py	2011-04-06 17:57:23 +0000
@@ -36,7 +36,7 @@
     tritcask,
     volume_manager,
 )
-from ubuntuone import syncdaemon
+from ubuntuone import syncdaemon, clientdefs
 import ubuntuone.platform
 
 from ubuntuone.platform import event_logging
@@ -95,6 +95,8 @@
         if not throttling_enabled:
             throttling_enabled = user_config.get_throttling()
 
+        self.logger.info("Starting Ubuntu One client version %s",
+                         clientdefs.VERSION)
         self.db = tritcask.Tritcask(self.tritcask_dir)
         self.vm = volume_manager.VolumeManager(self)
         self.fs = filesystem_manager.FileSystemManager(