Merge lp:~dobey/rhythmbox-ubuntuone/update-4-2 into lp:rhythmbox-ubuntuone/stable-4-2

[dobey]

[Rodney Dawes]

    Tell dbus to use the glib main loop for async support and signal handling.
    Add a test suite so we can prevent more bugs from landing in trunk.
    Use the correct attribute name, and dbus API to remove the signal handler.
    Fix lint/pep8 warnings.
    Use set -e in run-tests script to stop on errors.

[Mike McCracken (mikemc)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/rhythmbox-ubuntuone/update-4-2 into lp:rhythmbox-ubuntuone/stable-4-2 failed. Below is the output from the failed tests.

running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/ubuntuone
creating build/lib.linux-x86_64-2.7/ubuntuone/tests
copying ubuntuone/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/tests
copying ubuntuone/tests/test_ubuntuone.py -> build/lib.linux-x86_64-2.7/ubuntuone/tests
copying ubuntuone/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone
copying ubuntuone/ubuntuone.py -> build/lib.linux-x86_64-2.7/ubuntuone
running build_i18n
intltool-update -p -g rhythmbox-ubuntuone
msgfmt po/ru.po -o build/mo/ru/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/eu.po -o build/mo/eu/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/el.po -o build/mo/el/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/fi.po -o build/mo/fi/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/cs.po -o build/mo/cs/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/hr.po -o build/mo/hr/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/da.po -o build/mo/da/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/ro.po -o build/mo/ro/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/de.po -o build/mo/de/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/he.po -o build/mo/he/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/gl.po -o build/mo/gl/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/uk.po -o build/mo/uk/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/ca.po -o build/mo/ca/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/ka.po -o build/mo/ka/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/es.po -o build/mo/es/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/en_GB.po -o build/mo/en_GB/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/nl.po -o build/mo/nl/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/fr.po -o build/mo/fr/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/fy.po -o build/mo/fy/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/pl.po -o build/mo/pl/LC_MESSAGES/rhythmbox-ubuntuone.mo
msgfmt po/sv.po -o build/mo/sv/LC_MESSAGES/rhythmbox-ubuntuone.mo
intltool-merge -d po ubuntuone/ubuntuone.plugin.in build/lib/rhythmbox/plugins/ubuntuone/ubuntuone.plugin
Merging translations into build/lib/rhythmbox/plugins/ubuntuone/ubuntuone.plugin.
running build_icons
running build_help
WARNING: the following files are not recognized by DistUtilsExtra.auto:
  run-tests
  ubuntuone/ubuntuone.plugin.in

ERROR:root:Could not find any typelib for Peas
Traceback (most recent call last):
  File "/usr/bin/u1trial", line 40, in <module>
    main()
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 277, in main
    suite = test_runner.get_suite(options)
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 173, in get_suite
    config['ignore-paths']))
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 157, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 98, in _load_un...

=== modified file 'run-tests'
--- run-tests	2013-01-04 22:01:11 +0000
+++ run-tests	2013-01-30 16:24:21 +0000
@@ -1,7 +1,6 @@
 #!/bin/bash
-# Author: Natalia Bidart <[e-mail]>
 #
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -14,11 +13,13 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
+set -e
+
 ./setup.py build
-export PYTHONPATH=ubuntuone
+u1trial ubuntuone
 USE_PYFLAKES=1 u1lint .
 if [ -x `which pep8` ]; then
-    pep8 --repeat .
+    pep8  --exclude '.bzr,.pc,build' .
 else
     echo "Please install the 'pep8' package."
 fi

=== modified file 'setup.py'
--- setup.py	2013-01-08 21:51:20 +0000
+++ setup.py	2013-01-30 16:24:21 +0000
@@ -1,4 +1,18 @@
 #!/usr/bin/python
+# Copyright (C) 2009-2013 Canonical, Ltd.
+#
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License
+# version 3.0 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3.0 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library. If not, see
+# <http://www.gnu.org/licenses/>.
 """Setup script for Ubuntu One Music Store plug-in for Rhythmbox."""
 
 import DistUtilsExtra.auto

=== added file 'ubuntuone/__init__.py'
--- ubuntuone/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/__init__.py	2013-01-30 16:24:21 +0000
@@ -0,0 +1,16 @@
+# Copyright (C) 2013 Canonical, Ltd.
+#
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License
+# version 3.0 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3.0 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library. If not, see
+# <http://www.gnu.org/licenses/>.
+"""So we can import the plug-in in tests."""
+__import__('pkg_resources').declare_namespace(__name__)

=== added directory 'ubuntuone/tests'
=== added file 'ubuntuone/tests/__init__.py'
--- ubuntuone/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/tests/__init__.py	2013-01-30 16:24:21 +0000
@@ -0,0 +1,15 @@
+# Copyright (C) 2013 Canonical, Ltd.
+#
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License
+# version 3.0 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3.0 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library. If not, see
+# <http://www.gnu.org/licenses/>.
+"""Tests for the Ubuntu One extension for Rhythmbox."""

=== added file 'ubuntuone/tests/test_ubuntuone.py'
--- ubuntuone/tests/test_ubuntuone.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/tests/test_ubuntuone.py	2013-01-30 16:24:21 +0000
@@ -0,0 +1,136 @@
+# Copyright (C) 2013 Canonical, Ltd.
+#
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License
+# version 3.0 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3.0 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library. If not, see
+# <http://www.gnu.org/licenses/>.
+"""Tests for the main plug-in module."""
+
+from __future__ import print_function, unicode_literals
+
+import os
+import ubuntuone.ubuntuone as rbplugin
+
+from dirspec.utils import user_home
+from gi.repository import Gio, GObject
+from twisted.internet.defer import inlineCallbacks
+from ubuntuone.devtools.testcases.dbus import DBusTestCase
+
+
+class FakeSettings(GObject.GObject):
+    """Fake settings object."""
+    __gsignals__ = {
+        b'changed': (
+            GObject.SIGNAL_RUN_LAST | GObject.SIGNAL_DETAILED,
+            GObject.TYPE_NONE, (str,)),
+    }
+    values = {}
+
+    def get_strv(self, key):
+        """Get the value for key."""
+        value = self.values.get(key, [])
+        assert isinstance(value, list), 'Value must be type list.'
+        return value
+
+    def set_strv(self, key, value):
+        """Set the value for key."""
+        assert isinstance(value, list), 'Value must be type list.'
+        self.values[key] = value
+
+    @property
+    def locations(self):
+        """Return the currently set locations key value."""
+        return self.get_strv('locations')
+
+    def set_locations(self, value):
+        """Set the locations key value."""
+        self.set_strv('locations', value)
+
+
+class FakeDB(GObject.GObject):
+    """Fake DB object for tests."""
+    entries = {}
+
+    def entry_lookup_by_location(self, uri):
+        """Lookup an entry for the URI."""
+        return self.entries.get(uri, None)
+
+    def add_uri(self, uri):
+        """Add a URI to the entries list."""
+        self.entries[uri] = uri
+
+
+class FakeShell(GObject.GObject):
+    """Fake shell class to store the db property object."""
+    db = GObject.property(type=GObject.GObject)
+
+
+class ExtensionTestCase(DBusTestCase):
+    """Tests for the main extension class."""
+
+    @inlineCallbacks
+    def setUp(self):
+        """Prepare the test."""
+        yield super(ExtensionTestCase, self).setUp()
+        self.settings = FakeSettings()
+        self.patch(Gio, 'Settings', lambda _: self.settings)
+        self.plugin = rbplugin.UbuntuOnePlugin()
+        self.db = FakeDB()
+        shell = FakeShell()
+        shell.db = self.db
+        self.plugin.object = shell
+        self.lib_uri = Gio.File.new_for_path(rbplugin.U1LIBRARYPATH).get_uri()
+
+    def test_add_location_exists(self):
+        """Test that the library location doesn't get added twice."""
+        expected = [self.lib_uri]
+        self.settings.set_locations(expected)
+        self.plugin._locations_changed()
+        self.assertEqual(self.settings.locations, expected)
+
+    def test_add_location_missing(self):
+        """Test that adding the library location works when missing."""
+        expected = [self.lib_uri]
+        self.plugin._locations_changed()
+        self.assertEqual(self.settings.locations, expected)
+
+    def test_add_location_with_other(self):
+        """Test that location gets added, when another library path exists."""
+        music_uri = Gio.File.new_for_path(
+            os.path.join(user_home, 'Music')).get_uri()
+        self.settings.set_locations([music_uri])
+        expected = [music_uri, self.lib_uri]
+        self.plugin._locations_changed()
+        self.assertEqual(self.settings.locations, expected)
+
+    def test_del_location_bad_uri(self):
+        """Test that removing the old badly formated URI works."""
+        expected = [self.lib_uri]
+        self.settings.set_locations(['file://%s' % rbplugin.U1LIBRARYPATH])
+        self.plugin._locations_changed()
+        self.assertEqual(self.settings.locations, expected)
+
+    def test_del_location_non_uri(self):
+        """Test that removing the old non-URI path value works."""
+        expected = [self.lib_uri]
+        self.settings.set_locations([rbplugin.U1LIBRARYPATH])
+        self.plugin._locations_changed()
+        self.assertEqual(self.settings.locations, expected)
+
+    def test_download_finished(self):
+        """Test that the download finished call adds a track to the library."""
+        self.addCleanup(self.plugin.do_deactivate)
+        self.plugin.do_activate()
+        path = os.path.join(rbplugin.U1LIBRARYPATH,
+                            'Artist', 'Album', 'Track.mp3')
+        expected = Gio.File.new_for_path(path).get_uri()
+        self.plugin.download_finished(path, None)
+        self.assertEqual(self.db.entry_lookup_by_location(expected), expected)

=== modified file 'ubuntuone/ubuntuone.py'
--- ubuntuone/ubuntuone.py	2013-01-02 20:57:50 +0000
+++ ubuntuone/ubuntuone.py	2013-01-30 16:24:21 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2012 Canonical, Ltd.
+# Copyright (C) 2009-2013 Canonical, Ltd.
 #
 # This library is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License
@@ -19,9 +19,12 @@
 import os
 
 from dbus import SessionBus, DBusException
+from dbus.mainloop.glib import DBusGMainLoop
 from dirspec.utils import user_home
 from gi.repository import Gio, GObject, Peas
 
+DBusGMainLoop(set_as_default=True)
+
 U1LIBRARYPATH = os.path.join(user_home, '.ubuntuone',
                              'Purchased from Ubuntu One')
 
@@ -96,7 +99,7 @@
 
         # Disconnect the signal handler for downloads
         try:
-            self.bus.remove_signal_handler(self.download_finished,
-                                           signal_name='DownloadFinished')
+            self._bus.remove_signal_receiver(self.download_finished,
+                                             signal_name='DownloadFinished')
         except DBusException:
             return