Merge lp:~dobey/ubuntuone-installer/core-cache into lp:ubuntuone-installer

[dobey]

Add a fake aptdaemon and fake transaction object to avoid annoying dbus errors
Pass only the system sources.list as the the list to use for updating the cache

[Eric Casteleijn (thisfred)]

Looks fine to me

review: Approve

[Mike McCracken (mikemc)]

+1

review: Approve

=== modified file 'ubuntuone/installer/gui.py'
--- ubuntuone/installer/gui.py	2012-05-25 19:29:11 +0000
+++ ubuntuone/installer/gui.py	2012-07-03 19:54:18 +0000
@@ -406,7 +406,8 @@
             else:
                 self.__install_u1()
 
-        transaction = yield self.client.update_cache()
+        transaction = yield self.client.update_cache(
+            sources_list='/etc/apt/sources.list')
         transaction.connect('finished', finished)
         self.__apt_progress.set_transaction(transaction)
         transaction.run()

=== modified file 'ubuntuone/installer/tests/test_gui.py'
--- ubuntuone/installer/tests/test_gui.py	2012-05-21 17:56:04 +0000
+++ ubuntuone/installer/tests/test_gui.py	2012-07-03 19:54:18 +0000
@@ -21,12 +21,34 @@
 from ubuntuone.installer import gui
 
 
+class FakeTransaction(object):
+    """Fake transaction object."""
+
+    def connect(self, *args, **kwargs):
+        """Fake signal connection."""
+
+    def run(self, *args, **kwargs):
+        """Fake runner."""
+
+
+class FakeAptClient(object):
+    """Fake client for apt."""
+
+    def __init__(self, *args, **kwargs):
+        super(FakeAptClient, self).__init__(*args, **kwargs)
+
+    def update_cache(self, *args, **kwargs):
+        """Fake update_cache call."""
+        return FakeTransaction()
+
+
 class GUITestCase(DBusTestCase):
     """Main class tests."""
 
     @inlineCallbacks
     def setUp(self):
         yield super(GUITestCase, self).setUp()
+        self.patch(gui.aptclient, 'AptClient', FakeAptClient)
         gui.Gtk.main_quit = lambda: None
         gui.Gtk.main = lambda: None
         self.dlg = gui.Window()