Merge lp:~ralsina/ubuntuone-windows-installer/cloud-to-cloud into lp:ubuntuone-windows-installer

[Roberto Alsina]

- Improve the folder sync selection workflow (LP: #843865).

Improve the sync selection workflow.

To test IRL:

Start the installer. Login with an account that has UDFs or shares. After the "login successful" screen, you should get an overlay over an empty page for a bit, and then the "Folders" page. After that, the "Local folders" page, containing only subscribed UDFs and suggested ones.

Start the installer. Login with an account that has no UDFs or shares. After the "login successful" screen, you should get an overlay over an empty page for a bit, and then the "Local folders" page, containing only suggested UDFs.

[lp:~ralsina/ubuntuone-windows-installer/cloud-to-cloud]

61. By Roberto Alsina on 2011-09-07

EOLs

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Question:

when entering the SyncNowOrLaterPage, where its initializePage calls get_info and the overlay is shown, where is the overlay hid?

* Can you please move the self.patch(os.path, 'getsize', lambda *args: 0) to the testcase setup?
I'm getting this for test_status_after_get_info:

    test_status_after_get_info ... Exception in thread Thread-19:
Traceback (most recent call last):
  File "/usr/lib/python2.7/threading.py", line 552, in __bootstrap_inner
    self.run()
  File "/home/nessita/canonical/u1/windows-installer/review_cloud-to-cloud/ubuntuone_installer/gui/qt/local_folders.py", line 86, in run
    total_size += os.path.getsize(fp)
  File "/usr/lib/python2.7/genericpath.py", line 49, in getsize
    return os.stat(filename).st_size
OSError: [Errno 2] No such file or directory: '/tmp/tmp5i98v9/test_file'

* When testing IRL, right after the SSO's "Congratulations" page, I got an empty page with a loading overlay. A few seconds later, the overlay went away, but the page remained empty (I have a screenshot if you need it).
I had to click next on the empty page to get the cloud to computer page.

* And I never for the computer to cloud page :-/.

review: Needs Fixing

[Roberto Alsina (ralsina)]

> Question:
>
> when entering the SyncNowOrLaterPage, where its initializePage calls get_info
> and the overlay is shown, where is the overlay hid?

In the wizard's next()

> * Can you please move the self.patch(os.path, 'getsize', lambda *args: 0) to
> the testcase setup?
> I'm getting this for test_status_after_get_info:
>
> test_status_after_get_info ... Exception in thread Thread-19:
> Traceback (most recent call last):
> File "/usr/lib/python2.7/threading.py", line 552, in __bootstrap_inner
> self.run()
> File "/home/nessita/canonical/u1/windows-installer/review_cloud-to-
> cloud/ubuntuone_installer/gui/qt/local_folders.py", line 86, in run
> total_size += os.path.getsize(fp)
> File "/usr/lib/python2.7/genericpath.py", line 49, in getsize
> return os.stat(filename).st_size
> OSError: [Errno 2] No such file or directory: '/tmp/tmp5i98v9/test_file'

Sure. I am not sure if that won't break some other test that actually uses getsize though. Will check it.

>
> * When testing IRL, right after the SSO's "Congratulations" page, I got an
> empty page with a loading overlay. A few seconds later, the overlay went away,
> but the page remained empty (I have a screenshot if you need it).
> I had to click next on the empty page to get the cloud to computer page.

I believe you!

> * And I never for the computer to cloud page :-/.

That one should always be there, even if you get the "cloud to computer" page, it should after that.

[lp:~ralsina/ubuntuone-windows-installer/cloud-to-cloud]

62. By Roberto Alsina on 2011-09-08

separate tests that need getsize into a separate testcase

63. By Roberto Alsina on 2011-09-08

Make it work right with latest trunk

[Roberto Alsina (ralsina)]

The white page problem was caused by something that merged into trunk interacting badly with this branch. Fixed in revno 63

[Natalia Bidart (nataliabidart)]

The white page problem is indeed fixed but I still don't get the computer-to-cloud page.

So, after I login successfully, I get the congratulations page. Then, the loading overlay (when I click on setup now). Then, the cloud to computer screen, and then, zás, the last page with the "IMAGE GOES HERE" legend.

Am I missing something?

review: Needs Fixing

[Roberto Alsina (ralsina)]

I can't reproduce it. I included it in the build I just uploaded, let's see if it works?

[Natalia Bidart (nataliabidart)]

I tested with a fresh account and it worked, so approving.

review: Approve

=== removed file 'data/qt/sync_now_or_later.ui'
--- data/qt/sync_now_or_later.ui	2011-09-02 12:58:29 +0000
+++ data/qt/sync_now_or_later.ui	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>426</width>
-    <height>387</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>24</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
-      <font>
-       <pointsize>14</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Syncing your computer with the cloud</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_9">
-     <property name="text">
-      <string>It seems that you have already some folders in the cloud. 
-Do you want to sync everything with this computer now?</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QRadioButton" name="sync_now">
-     <property name="text">
-      <string>Yes, sync all now</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QRadioButton" name="sync_later">
-     <property name="text">
-      <string>No, I'll do it later</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QRadioButton" name="sync_custom">
-     <property name="text">
-      <string>Yes, but I want to choose what to sync</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>54</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
 
=== modified file 'ubuntuone_installer/gui/qt/folders.py'
--- ubuntuone_installer/gui/qt/folders.py	2011-09-01 21:26:50 +0000
+++ ubuntuone_installer/gui/qt/folders.py	2011-09-08 14:21:18 +0000
@@ -25,6 +25,7 @@
 from ubuntu_sso.qt.gui import SSOWizardPage
 from ubuntuone.controlpanel.gui.qt import folders
 
+from ubuntuone_installer.gui import NEXT
 from ubuntuone_installer.gui.qt.ui import folders_ui
 
 _ = gettext.gettext
@@ -55,7 +56,9 @@
             QtGui.QWizard.BackButton,
             QtGui.QWizard.Stretch,
             QtGui.QWizard.NextButton])
-        self.wizard()._next_id = self.wizard().CONGRATULATIONS_PAGE
+        self.wizard().setButtonText(QtGui.QWizard.NextButton,
+            NEXT)
+        self.wizard()._next_id = self.wizard().local_folders_page_id
 
     # pylint: enable=C0103
 
 
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-07 15:51:10 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-09-08 14:21:18 +0000
@@ -82,7 +82,6 @@
 TITLE_STYLE = "<span style=\"font-size:24px\">%s</span>"
 CREDENTIALS_ERROR_TITLE = _("Error getting credentials")
 CREDENTIALS_ERROR = _('Application will close.\n\n%r')
-STARTING_CP_ERROR = _('Error starting Ubuntu One')
 SKIP_TOUR = _("Skip tour, go to Dashboard")
 START_SETUP = _("Start setup")
 # Invalid name logger
@@ -237,12 +236,6 @@
         self.wizard().setButtonLayout([
             QtGui.QWizard.Stretch,
             QtGui.QWizard.FinishButton])
-        if self.field("sync_now").toBool() \
-            or self.field("sync_custom").toBool():
-            self.ui.progressContainer.setVisible(True)
-        else:
-            self.ui.progressContainer.setVisible(False)
-
         # Set FinishButton as default when the page is shown.
         self.wizard().button(QtGui.QWizard.FinishButton).setDefault(True)
         self.wizard().button(QtGui.QWizard.FinishButton).style().unpolish(
@@ -372,11 +365,11 @@
 
         # End of SSO pages
 
-        self.local_folders_page = LocalFoldersPage()
-        self.local_folders_page_id = self.addPage(self.local_folders_page)
         self.SYNC_NOW_OR_LATER_PAGE = self.addPage(SyncNowOrLaterPage())
         self.folders_page = FoldersPage()
         self.folders_page_id = self.addPage(self.folders_page)
+        self.local_folders_page = LocalFoldersPage()
+        self.local_folders_page_id = self.addPage(self.local_folders_page)
         self.preferences_page = PreferencesPage()
         self.preferences_page_id = self.addPage(self.preferences_page)
         self.CONGRATULATIONS_PAGE = self.addPage(CongratulationsPage())
@@ -402,7 +395,8 @@
         """Show the next page to display and remove the form errors label."""
         self.overlay.hide()
         self.form_errors_label.hide()
-        self.currentPage().layout().removeWidget(self.form_errors_label)
+        if self.currentPage().layout():
+            self.currentPage().layout().removeWidget(self.form_errors_label)
         self.form_errors_label.setParent(None)
         super(MainWindow, self).next()
 
@@ -417,13 +411,13 @@
         """Called on successful login."""
         self._next_id = self.SUCCESS_PAGE
         self.next()
-        self._next_id = self.local_folders_page_id
+        self._next_id = self.SYNC_NOW_OR_LATER_PAGE
 
     def registration_success_slot(self):
         """Called on successful registration."""
         self._next_id = self.SUCCESS_PAGE
         self.next()
-        self._next_id = self.local_folders_page_id
+        self._next_id = self.SYNC_NOW_OR_LATER_PAGE
 
     def done(self, result):
         """The main window is being closed, call any custom callback."""
@@ -448,7 +442,7 @@
         if page_id < self.SIGNIN_PAGE:
             self.sideWidget().ui.states_frame.hide()
             self.sideWidget().set_stage(0)
-        elif page_id < self.local_folders_page_id:
+        elif page_id < self.SYNC_NOW_OR_LATER_PAGE:
             self.sideWidget().ui.states_frame.show()
             self.sideWidget().set_stage(1)
         elif page_id < self.CONGRATULATIONS_PAGE:
 
=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-09-05 21:12:02 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-09-08 14:21:18 +0000
@@ -113,7 +113,7 @@
             QtGui.QWizard.NextButton])
         self.wizard().setButtonText(QtGui.QWizard.NextButton,
             NEXT)
-        self.wizard()._next_id = self.wizard().SYNC_NOW_OR_LATER_PAGE
+        self.wizard()._next_id = self.wizard().CONGRATULATIONS_PAGE
         # Start with this invisible
         self.ui.offer_frame.setVisible(False)
         # Show overlay until we have server data
@@ -134,16 +134,16 @@
                         self.folders_info.append(volume)
             self.ui.folder_list.clear()
             for folder in self.folders_info:
-                item = yield self.add_folder(
-                    os.path.expanduser(folder['path']),
-                    validate=False,
-                    volume_id=folder['volume_id'],
-                    calculate=False,
-                    )
-                if item:
-                    if folder['subscribed']:
+                if folder['subscribed']:
+                    item = yield self.add_folder(
+                        os.path.expanduser(folder['path']),
+                        validate=False,
+                        volume_id=folder['volume_id'],
+                        calculate=False,
+                        )
+                    if item:
                         item.setCheckState(0, QtCore.Qt.Checked)
-                    item.size = 0
+                        item.size = 0
             for folder_name in default_folders():
                 item = yield self.add_folder(folder_name, validate=True)
             self.timer.start(2000)
 
=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-09-07 11:24:12 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-09-08 14:21:18 +0000
@@ -46,12 +46,8 @@
 def success_cb(creds, gui):
     """Handle credentials success."""
     if creds:  # Have credentials already
-        try:
-            from ubuntuone_installer.gui.qt import utils
-            utils.start_control_panel()
-        except OSError:
-            QtGui.QMessageBox.critical(
-                None, "Ubuntu One", gui.STARTING_CP_ERROR)
+        from ubuntuone_installer.gui.qt import utils
+        utils.start_control_panel()
         stop()
     else:  # No credentials
         window = gui.MainWindow(close_callback=stop)
 
=== modified file 'ubuntuone_installer/gui/qt/sync_now_or_later.py'
--- ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-08-10 21:37:30 +0000
+++ ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-09-08 14:21:18 +0000
@@ -19,8 +19,16 @@
 """The user interface for the Ubuntu One Installer."""
 
 from PyQt4 import QtGui
-
-from ubuntuone_installer.gui.qt.ui import sync_now_or_later_ui
+from twisted.internet.defer import inlineCallbacks
+from ubuntuone.controlpanel import backend
+
+from ubuntuone_installer.gui import NEXT
+from ubuntuone_installer.logger import setup_logging
+
+# Invalid name logger
+# pylint: disable=C0103
+logger = setup_logging('qt.sync_now_or_later')
+# pylint: enable=C0103
 
 
 class SyncNowOrLaterPage(QtGui.QWizardPage):
@@ -28,11 +36,8 @@
 
     def __init__(self, parent=None):
         QtGui.QWizardPage.__init__(self, parent)
-        self.ui = sync_now_or_later_ui.Ui_Form()
-        self.ui.setupUi(self)
-        self.registerField("sync_now", self.ui.sync_now)
-        self.registerField("sync_later", self.ui.sync_later)
-        self.registerField("sync_custom", self.ui.sync_custom)
+        self.has_cloud_folders = False
+        self.cp_backend = None
 
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
@@ -42,10 +47,34 @@
         self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
         self.wizard().setOption(QtGui.QWizard.NoCancelButton, True)
         self.wizard()._next_id = None
+        self.wizard().overlay.show()
+        self.wizard().setButtonText(QtGui.QWizard.NextButton,
+            NEXT)
+        self.get_info()
 
     def nextId(self):
         """Go to the next page depending on the select field."""
-        if self.field("sync_custom"):
+        if self.has_cloud_folders:
             return self.wizard().folders_page_id
         else:
-            return self.wizard().CONGRATULATIONS_PAGE
+            return self.wizard().local_folders_page_id
+
+    @inlineCallbacks
+    def get_info(self):
+        """Get folder information from CP backend."""
+        # pylint: disable=W0702
+        try:
+            self.cp_backend = backend.ControlBackend()
+            volumes_info = yield self.cp_backend.volumes_info()
+        except:
+            logger.exception("Error getting backend info:")
+        else:
+            counter = 0
+            for _, _, volumes in volumes_info:
+                counter += len(volumes)
+            if counter > 1:
+                # there are UDFs or shares, show cloud-to-computer
+                self.has_cloud_folders = True
+            else:
+                self.has_cloud_folders = False
+            self.wizard().next()
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-08 13:41:10 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-08 14:21:18 +0000
@@ -291,7 +291,7 @@
         tree_folders = folders_page.folders_widget.ui.folders
         self.assertEqual(tree_folders.isColumnHidden(2), True)
         # pylint: disable=W0212
-        self.assertEqual(self.ui._next_id, self.ui.CONGRATULATIONS_PAGE)
+        self.assertEqual(self.ui._next_id, self.ui.local_folders_page_id)
 
     def test_folders_page_next_id(self):
         """Check Folders Page UI."""
@@ -432,7 +432,6 @@
     @skipIfOS('linux2', 'Windows-specific tests.')
     def test_start_control_panel_frozen(self):
         """When frozen, the control-panel has a path."""
-        self.ui.setStartId(self.ui.SYNC_NOW_OR_LATER_PAGE)
         self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
@@ -476,66 +475,6 @@
         self.assertEqual(self._called, False)
         self.assertEqual(FakeAreYouSure.shown, False)
 
-    def test_later_accepts_cancel(self):
-        """Clicking 'Later' accepts cancellation."""
-        self.ui.setStartId(self.ui.SYNC_NOW_OR_LATER_PAGE)
-        self.ui.restart()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        gui.AreYouSure.result = 1
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        self.ui.done(result=0)
-        self.assertEqual(self.ui.isVisible(), False)
-
-    def test_sync_now_shows_message(self):
-        """If the user selects 'Sync Now' the congrats page shows a message."""
-        congrats_page = self.ui.page(self.ui.CONGRATULATIONS_PAGE)
-        congrats_page.setField("sync_now", True)
-
-        # Show the congrats page
-        self.ui.setStartId(self.ui.CONGRATULATIONS_PAGE)
-        self.ui.restart()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-
-        # Check the properties have the right values
-        self.assertEqual(congrats_page.field("sync_later").toBool(),
-            False)
-        self.assertEqual(
-            congrats_page.ui.progressContainer.isVisible(), True)
-
-    def test_sync_page_custom_field(self):
-        """If the user selects 'Sync Custom' we move to Folders page."""
-        sync_page = self.ui.page(self.ui.SYNC_NOW_OR_LATER_PAGE)
-        sync_page.setField("sync_custom", True)
-
-        # Show the Sync Now page
-        self.ui.setStartId(self.ui.SYNC_NOW_OR_LATER_PAGE)
-        self.ui.restart()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-
-        # Check the navigation is correct
-        self.assertEqual(sync_page.nextId(), self.ui.folders_page_id)
-
-    def test_sync_later_hides_message(self):
-        """Selecting 'Sync Later' the congrats page hides a message."""
-        congrats_page = self.ui.page(self.ui.CONGRATULATIONS_PAGE)
-        congrats_page.setField("sync_later", True)
-
-        # Show the congrats page
-        self.ui.setStartId(self.ui.CONGRATULATIONS_PAGE)
-        self.ui.restart()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-
-        # Check the properties have the right values
-        self.assertEqual(congrats_page.field("sync_now").toBool(),
-            False)
-        self.assertEqual(
-            congrats_page.ui.progressContainer.isVisible(), False)
-
     def test_current_user_controller_parameters(self):
         """Compare controller parameters with expected values."""
         self.assertEqual(self.ui.current_user_controller.args,
@@ -636,17 +575,21 @@
 
     """A fake MainWindow."""
 
-    overlay = FakeOverlay()
     currentIdChanged = FakeSignal()
     loginSuccess = FakeSignal()
     registrationSuccess = FakeSignal()
     userCancellation = FakeSignal()
     shown = False
     SYNC_NOW_OR_LATER_PAGE = 4
+    CONGRATULATIONS_PAGE = 5
+    folders_page_id = 6
+    local_folders_page_id = 7
 
     def __init__(self, close_callback=None):
         self.button_texts = []
         self.button_layout = None
+        self.options = []
+        self.overlay = FakeOverlay()
 
     def show(self):
         """Fake method."""
@@ -661,6 +604,13 @@
         """Fake setButtonText."""
         self.button_layout = layout
 
+    def setOption(self, *args):
+        """Fake setOption."""
+        self.options.append(args)
+
+    def next(self):
+        """Fake next."""
+
 
 class SuccesPageTestCase(BaseTestCase):
     """Test the SuccessPage code."""
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
--- ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-05 22:00:40 +0000
+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-08 14:21:18 +0000
@@ -26,9 +26,7 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 
-from ubuntuone_installer.gui import (
-    NEXT,
-)
+from ubuntuone_installer.gui import NEXT
 from ubuntuone_installer.gui.qt import local_folders
 from ubuntuone_installer.gui.qt.tests import BaseTestCase, TestCase
 from ubuntuone_installer.gui.qt.tests.test_gui import FakeMainWindow
@@ -164,8 +162,8 @@
         self.assertEqual(item.volume_id, "xyzzy")
 
 
-class LocalFoldersTestCase(BaseTestCase):
-    """Test the LocalFoldersPage code."""
+class LocalFoldersWithGetSizeTestCase(BaseTestCase):
+    """Test the LocalFoldersPage code using the real getsize."""
 
     class_ui = local_folders.LocalFoldersPage
 
@@ -183,6 +181,48 @@
         self.addCleanup(shutil.rmtree, self.tmpdir)
         self.fake_wizard = FakeMainWindow()
         self.patch(local_folders.backend, "ControlBackend", FakeCPBackend)
+        super(LocalFoldersWithGetSizeTestCase, self).setUp()
+        self.patch(self.ui, "wizard", lambda: self.fake_wizard)
+
+    @defer.inlineCallbacks
+    def test_total_size(self):
+        """Test that the header reflects the change in item sizes."""
+        self.patch(self.ui, "show_hide_offer", self._set_called)
+        yield self.ui.get_info()
+        self.ui.ui.folder_list.clear()
+        self.ui.items = {}
+        item = yield self.ui.add_folder(self.tmpdir)
+        item.thread.run()
+        item.thread.join()
+        item.size = 1337
+        item.setCheckState(0, QtCore.Qt.Checked)
+        self.ui.update_sizes()
+        self.assertEqual(unicode(self.ui.ui.folder_list.headerItem().text(1)),
+            u"Space (1.5 KiB)")
+        self.assertEqual(self._called, ((1537L,), {}))
+
+    def test_size_calculation(self):
+        """Test the recursive folder size calculation."""
+        queue = Queue.Queue()
+        csize = local_folders.CalculateSize(self.tmpdir, queue)
+        csize.run()
+        path, size = queue.get()
+        self.assertEqual(path, self.tmpdir)
+        self.assertEqual(size, 1337)
+
+
+class LocalFoldersTestCase(BaseTestCase):
+    """Test the LocalFoldersPage code."""
+
+    class_ui = local_folders.LocalFoldersPage
+
+    def setUp(self):
+        """Initialize this test instance."""
+        self.tmpdir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.tmpdir)
+        self.fake_wizard = FakeMainWindow()
+        self.patch(local_folders.backend, "ControlBackend", FakeCPBackend)
+        self.patch(os.path, 'getsize', lambda *args: 0)
         super(LocalFoldersTestCase, self).setUp()
         self.patch(self.ui, "wizard", lambda: self.fake_wizard)
 
@@ -199,8 +239,8 @@
         """Test status of page components after initializePage()."""
         self.patch(self.ui, "get_info", self._set_called)
         self.ui.initializePage()
-        self.assertTrue(self.ui.wizard().overlay.show_counter, 1)
-        self.assertTrue(self.ui.wizard().overlay.hide_counter, 0)
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 1)
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 0)
         self.assertFalse(self.ui.ui.offer_frame.isVisible())
         self.assertEqual(self._called, ((), {}))
         self.assertEqual(self.ui.wizard().button_texts,
@@ -211,15 +251,12 @@
         """Test status of page components after get_info()."""
         yield self.ui.get_info()
         self.assertTrue(self.ui.wizard().overlay.hide_counter, 1)
-        self.assertEqual(self.ui.ui.folder_list.topLevelItemCount(), 5)
+        self.assertEqual(self.ui.ui.folder_list.topLevelItemCount(), 4)
         self.assertEqual(self.ui.wizard().currentIdChanged.target,
             self.ui.changed_page)
         self.assertEqual(
             self.ui.items[os.path.expanduser('~/xyzzy')].checkState(0),
             QtCore.Qt.Checked)
-        self.assertEqual(
-            self.ui.items[os.path.expanduser('~/zxyzzy')].checkState(0),
-            QtCore.Qt.Unchecked)
         check_states = [self.ui.items[item].checkState(0)
             for item in self.ui.items]
         self.assertEqual(len([
@@ -236,22 +273,10 @@
         self.assertEqual(item.volume_id, 'asdfgh')
 
     @defer.inlineCallbacks
-    def test_unsubscribed_udf_checked(self):
-        """Check that unsubscribed UDF items are created correctly."""
+    def test_unsubscribed_udf_not_added(self):
+        """Check that unsubscribed UDF items are not added."""
         yield self.ui.get_info()
-        item = self.ui.items[os.path.expanduser(u'~/zxyzzy')]
-        self.assertEqual(item.checkState(0), QtCore.Qt.Unchecked)
-        self.assertEqual(item.size, 0)
-        self.assertEqual(item.volume_id, 'qwerty')
-
-    def test_size_calculation(self):
-        """Test the recursive folder size calculation."""
-        queue = Queue.Queue()
-        csize = local_folders.CalculateSize(self.tmpdir, queue)
-        csize.run()
-        path, size = queue.get()
-        self.assertEqual(path, self.tmpdir)
-        self.assertEqual(size, 1337)
+        self.assertNotIn(os.path.expanduser(u'~/zxyzzy'), self.ui.items)
 
     @defer.inlineCallbacks
     def test_item_addition(self):
@@ -293,23 +318,6 @@
         self.assertEqual(1, self.ui.ui.folder_list.topLevelItemCount())
 
     @defer.inlineCallbacks
-    def test_total_size(self):
-        """Test that the header reflects the change in item sizes."""
-        self.patch(self.ui, "show_hide_offer", self._set_called)
-        yield self.ui.get_info()
-        self.ui.ui.folder_list.clear()
-        self.ui.items = {}
-        item = yield self.ui.add_folder(self.tmpdir)
-        item.thread.run()
-        item.thread.join()
-        item.size = 1337
-        item.setCheckState(0, QtCore.Qt.Checked)
-        self.ui.update_sizes()
-        self.assertEqual(unicode(self.ui.ui.folder_list.headerItem().text(1)),
-            u"Space (1.5 KiB)")
-        self.assertEqual(self._called, ((1537L,), {}))
-
-    @defer.inlineCallbacks
     def test_total_size_unchecked(self):
         """Unchecked items use no space beyond quota_used."""
         self.patch(self.ui, "show_hide_offer", self._set_called)
@@ -441,8 +449,7 @@
         self.ui.changed_page(self.ui.wizard().SYNC_NOW_OR_LATER_PAGE)
         changes = sorted(self.ui.cp_backend.volume_setings_changes)
         self.assertEqual(changes,
-            sorted([('asdfgh', {'subscribed': True}),
-                    ('qwerty', {'subscribed': False})]))
+            [('asdfgh', {'subscribed': True})])
         self.assertEqual(self.ui.wizard().overlay.show_counter,
             show_counter + 1)
         self.assertEqual(self.ui.wizard().overlay.hide_counter,
 
=== added file 'ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py'
--- ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py	2011-09-08 14:21:18 +0000
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# 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 the sync_now_or_later page."""
+
+import os
+
+from PyQt4 import QtGui
+from twisted.internet import defer
+
+from ubuntuone_installer.gui import NEXT
+from ubuntuone_installer.gui.qt import sync_now_or_later
+from ubuntuone_installer.gui.qt.tests import BaseTestCase
+from ubuntuone_installer.gui.qt.tests.test_gui import FakeMainWindow
+from ubuntuone_installer.gui.qt.tests.test_local_folders import (
+    FakeCPBackend,
+)
+
+
+class FakeEmptyCPBackend(FakeCPBackend):
+    """A CP backend that returns only one folder."""
+    def volumes_info(self, *args):
+        """Fake volumes info."""
+        return defer.succeed(((None, None,
+            [
+            {
+                'type': u'ROOT',
+                'path': os.path.expanduser(u'~/Ubuntu One'),
+                'volume_id': 'asdfgh',
+                'subscribed': True,
+            }]),))
+
+
+class SyncNowOrLaterTestCase(BaseTestCase):
+    """Test the sync_now_or_later page."""
+
+    class_ui = sync_now_or_later.SyncNowOrLaterPage
+
+    def setUp(self):
+        """Initialize tests."""
+        super(SyncNowOrLaterTestCase, self).setUp()
+        self.main_window = FakeMainWindow()
+        self.patch(self.ui, "wizard", lambda: self.main_window)
+        self.patch(sync_now_or_later.backend, "ControlBackend", FakeCPBackend)
+
+    @defer.inlineCallbacks
+    def test_has_folders_in_cloud(self):
+        """test behaviour when the user has folders in the cloud."""
+        yield self.ui.get_info()
+        self.assertTrue(self.ui.has_cloud_folders)
+
+    @defer.inlineCallbacks
+    def test_has_no_folders_in_cloud(self):
+        """test behaviour when the user has no folders in the cloud."""
+        self.patch(sync_now_or_later.backend,
+            "ControlBackend", FakeEmptyCPBackend)
+        yield self.ui.get_info()
+        self.assertFalse(self.ui.has_cloud_folders)
+
+    def test_has_cloud_folders_next(self):
+        """With cloud folders, next page is folders."""
+        self.ui.has_cloud_folders = True
+        self.assertEqual(self.ui.nextId(), FakeMainWindow.folders_page_id)
+
+    def test_has_no_cloud_folders_next(self):
+        """With cloud folders, next page is folders."""
+        self.ui.has_cloud_folders = False
+        self.assertEqual(self.ui.nextId(),
+            FakeMainWindow.local_folders_page_id)
+
+    def test_status_after_initialize(self):
+        """Test that everything is initialized correctly."""
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 0)
+        self.ui.initializePage()
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 1)
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 0)
+        self.assertEqual(self.ui.wizard().button_texts,
+            [(QtGui.QWizard.NextButton, NEXT)])