Merge lp:~diegosarmentero/ubuntuone-windows-installer/network-detect into lp:ubuntuone-windows-installer

[Diego Sarmentero]

- Fixed: Missing page: No network detected (LP: #804610).

Fixed: Missing page: No network detected (LP: #804610).

To test in real life, you need to execute the installer with the "--installer param.
And configure the VM enabling the net adaptar for the traditional flow and then disabling the net adapter to see the Network Detection page.

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

74. By Diego Sarmentero on 2011-09-28

- Fixed: There is no feedback on captcha loading/refreshing (LP: #852105).

75. By Diego Sarmentero on 2011-10-03

Fixed: LocalFoldersPage.get_info does not hide the overlay on backend error (LP: #828944).

76. By Manuel de la Peña on 2011-10-04

Provides a function that allows the installer to know if the old beta is installed in the system. The technique uses the msi lib and ctypes to check that the uid of the old beta is present in the system.

[Alejandro J. Cura (alecu)]

Question: does this branch depend on the sso/network-detect branch? Should I use that to test this one?

Reviewing it, the branch looks fine. Just one detail:
Is this copypasta? "Authors: Roberto Alsina <email address hidden>"

review: Needs Information

[Diego Sarmentero (diegosarmentero)]

> Question: does this branch depend on the sso/network-detect branch? Should I
> use that to test this one?
>
> Reviewing it, the branch looks fine. Just one detail:
> Is this copypasta? "Authors: Roberto Alsina <email address hidden>"

Yes, this depends on the other branch.

And i forgot to include myself as an author (Roberto started a branch for this, and i took what he has to keep on this task).

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

77. By Alejandro J. Cura on 2011-10-07

Do a HEAD request on the server to get accurate timestamp (LP: #692597).

78. By Manuel de la Peña on 2011-10-11

Provides a function that can be used to uninstall the old beta of ubuntu one.

79. By Diego Sarmentero on 2011-10-11

Fixed: When running the wizard from the bundle, the "Skip tour" is the default button (LP: #845778).
Fixed: When running the wizard from the bundle, there is no default button in the first screen (LP: #848016).

80. By Diego Sarmentero on 2011-10-13

Fixed: Wizard is not closed on license agreement screen (LP: #835167).

81. By Manuel de la Peña on 2011-10-18

Provides a function that allows to migrate the data that was downloed by the previous beta.

82. By Manuel de la Peña on 2011-10-21

Fix the reactor installation by ensuring that tools does not install the reactor.

83. By Diego Sarmentero on 2011-10-28

Fixed Tests (LP: #882519).

84. By Natalia Bidart on 2011-11-07

Bump release for development.

85. By Diego Sarmentero on 2011-11-08

Fixed: Should call self.backend.connect_files as soon as valid credentials are created (LP: #852085).

86. By Diego Sarmentero on 2011-11-11

- Fixed: Process finished successfully (LP: #859743).

87. By Diego Sarmentero on 2011-11-11

Fixed: Successfull message after login says "TextLabel" (LP: #889255).

88. By Natalia Bidart on 2011-11-12

- Import qt4reactor properly (LP: #888722).

89. By Natalia Bidart on 2011-11-14

- Bump release for development.

90. By Manuel de la Peña on 2011-11-23

Changed the import from ubuntuone-dev-tools so that we do not use the deprecated API.

91. By Manuel de la Peña on 2011-11-24

Fixes the code that will call the autoupdate-windows.exe. The idea is that in the release the .exe will be in a diff location to avoid dll collisions.

92. By Diego Sarmentero on 2011-11-25

Fixed congratulations page (LP: #859711).

93. By Natalia Bidart on 2011-12-01

- Pass module for test to u1trial properly.

94. By Manuel de la Peña on 2011-12-01

Put all the different pieces of the migration together so that we perform the uninstall and migtration of the data if the user has the very old first beta.

95. By Diego Sarmentero on 2011-12-13

Fixed: When logging in with an no-yet-validated account, there is no useful message (LP: #851885).

96. By Diego Sarmentero on 2011-12-13

Fixed lint issues

97. By Roberto Alsina on 2011-12-21

Quote the paths for autostart.

98. By Roberto Alsina on 2011-12-26

Make UDF creation from the wizard work.

99. By Natalia Bidart on 2012-01-03

- Proper naming for the project (using ubuntuone-windows-installer now).

100. By Diego Sarmentero on 2012-01-04

Agree button modified to look as a default button.

101. By Roberto Alsina on 2012-01-04

Fix strings to:

1) Fix a grammar error
2) Mention Ubuntu One so the user knows what he's upgrading.

[Natalia Bidart (nataliabidart)]

When trying to merged this branch into latest trunk, I get:

Warning: criss-cross merge encountered. See bzr help criss-cross.
 M ubuntuone_installer/gui/qt/tests/test_gui.py
Text conflict in ubuntuone_installer/gui/qt/tests/test_gui.py
1 conflicts encountered.

Can you please remove the criss-cross and resolve the conflict?

Thanks!!!

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

102. By Diego Sarmentero on 2012-01-05

Conflicts resolved

103. By Diego Sarmentero on 2012-01-05

Adding network_detection file

104. By Diego Sarmentero on 2012-01-05

Fixed custom button in License Page.

[Natalia Bidart (nataliabidart)]

I'm getting this lint issue:

== Python Lint Notices ==

ubuntuone_installer/gui/qt/tests/__init__.py:
    178: [C0111, FakeWizardButtonStyle] Missing docstring

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

105. By Diego Sarmentero on 2012-01-06

New Network detection implementation.
Added more tests.

[Natalia Bidart (nataliabidart)]

I have several tests not passing: http://pastebin.ubuntu.com/798185/

Also (this comes from trunk):

ubuntuone_installer/gui/qt/tests/__init__.py:
    178: [C0111, FakeWizardButtonStyle] Missing docstring

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Running u1lint directly on this branch I'm getting these:

== Python Lint Notices ==

ubuntuone_installer/gui/qt/gui.py:
    200: [W0212, LicensePage.check_connection] Access to a protected member _next_id of a client class

ubuntuone_installer/gui/qt/tests/__init__.py:
    185: [C0103, FakeWizardButtonStyle.__init__] Invalid name "customButtonClicked" (should match [a-z_][a-z0-9_]{1,30}$)

ubuntuone_installer/gui/qt/tests/test_gui.py:
    154: [W0622, MainWindowTestCase.test_network_detection_connection_enabled] Redefining built-in 'id'
    166: [W0622, MainWindowTestCase.test_network_detection_connection_disabled] Redefining built-in 'id'
    178: [W0622, MainWindowTestCase.test_license_page_check_connection_no_button] Redefining built-in 'id'
    194: [W0622, MainWindowTestCase.test_license_page_check_connection_error] Redefining built-in 'id'
    216: [W0212, MainWindowTestCase.test_check_connection_with_connection] Access to a protected member _next_id of a client class
    225: [W0212, MainWindowTestCase.test_check_connection_with_no_connection] Access to a protected member _next_id of a client class
    237: [W0212, MainWindowTestCase.test_check_connection_with_exception] Access to a protected member _next_id of a client class

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

106. By Diego Sarmentero on 2012-01-09

Tests and lint issues fixed

[Natalia Bidart (nataliabidart)]

- The new TestCase added in ubuntuone_installer/gui/tests/__init__.py is duplicated from ubuntuone_installer/tests/__init__.py, please use that instead.

- As far as I see, there are no test for the new module ubuntuone_installer/gui/qt/network_detection.py. There should be a new test file called ubuntuone_installer/gui/qt/tests/test_network_detection.py that tests that new module.

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

107. By Diego Sarmentero on 2012-01-10

Adding network_detection test case.

[Natalia Bidart (nataliabidart)]

I'm getting all these lint issues:

== Python Lint Notices ==

ubuntuone_installer/gui/qt/tests/__init__.py:
    224: [C0111, FakeWizardButtonStyle.next] Missing docstring

ubuntuone_installer/gui/qt/tests/test_network_detection.py:
    40: [C0111, NetworkDetectionTestCase._get_wizard] Missing docstring
    46: [W0212, NetworkDetectionTestCase.test_initialize_page] Access to a protected member _next_id of a client class
    61: [W0212, NetworkDetectionTestCase.test_try_again_with_connection] Access to a protected member _next_id of a client class
    72: [W0212, NetworkDetectionTestCase.test_try_again_without_connection] Access to a protected member _next_id of a client class

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

108. By Diego Sarmentero on 2012-01-11

fixed lint issues.

[Alejandro J. Cura (alecu)]

This branch is looking lovely, thanks for working on it.

One issue:
138 + except Exception, reason:
...
140 + self.critical(reason.message, self.network_page)

I don't think that showing in the UI the exception message is the right thing
I think we should have a generic/custom error message that's translatable in the U1-win-installer code itself; something like "Cannot get network state" and log the exact reason.

review: Needs Fixing

[Alejandro J. Cura (alecu)]

Another thing, that may deserve a new bug: assertEqualPixmaps should be used from a common location, perhaps in sso.

[Alejandro J. Cura (alecu)]

The rest of the branch looks nice; as soon as the above is fixed, ping me and I'll run the tests.
Thanks!

[Diego Sarmentero (diegosarmentero)]

> Another thing, that may deserve a new bug: assertEqualPixmaps should be used
> from a common location, perhaps in sso.

Bug created for this:
https://bugs.launchpad.net/ubuntu-sso-client/+bug/915281

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

109. By Diego Sarmentero on 2012-01-12

changing network state exception message.

[Natalia Bidart (nataliabidart)]

The is an error in a test:

===============================================================================
[FAIL]
Traceback (most recent call last):
  File "E:\windows-installer\review_network-detect\ubuntuone_installer\gui\qt\te
sts\test_gui.py", line 196, in test_license_page_check_connection_error
    self.assertEqual(self.ui.form_errors_label.text(), 'Error...')
twisted.trial.unittest.FailTest: not equal:
a = PyQt4.QtCore.QString(u'The network state can not be detected.')
b = 'Error...'

ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_license_page_c
heck_connection_error
-------------------------------------------------------------------------------

Please run the tests *every single time* before pushing a change, even if it's just a string change ;-). Thanks!

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

110. By Diego Sarmentero on 2012-01-12

Removing unnecessary tests.

[Alejandro J. Cura (alecu)]

The try: except: removed in the previous-to-last commit should not be removed, because if networkstate.is_machine_connected fails before returning a deferred, or if that deferred errbacks, then we should treat this as if the connection is present.

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

111. By Diego Sarmentero on 2012-01-13

Fixing some tests.

[Natalia Bidart (nataliabidart)]

This branch is pratically ready, but when testing IRL, using the following scenario:

* with internet connection, open the installer. You should get the login/register screen. Do nothing for now.
* disable your internet connection from the "Network and Sharing Center".
* open the installer and confirm that the "no network" sreen is shown. Do not close the installer.
* re-enable your internet connection from the "Network and Sharing Center".
* in the opened installer, click "Try again". You will now have the login/register screen, as expected.
* click on the "Sign me with my existent account" button. Nothing happens, and console errors with:

2012-01-16 11:51:11,612:612.999916077 - ubuntu_sso.controllers - DEBUG - ChooseSignInController._set_next_existing QWizard::next: Page 1 already met

If I click on the "Sign me up" button, I get nothing in the UI and in the terminal:

2012-01-16 11:51:11,612:612.999916077 - ubuntu_sso.controllers - DEBUG - ChooseSignInController._set_next_existing
QWizard::next: Page 1 already met

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

112. By Diego Sarmentero on 2012-01-17

Fixed page navigation

113. By Diego Sarmentero on 2012-01-17

fixing sign in page navigation

114. By Diego Sarmentero on 2012-01-18

Merge and fixed tests.

[Natalia Bidart (nataliabidart)]

So, now when I open the wizard with no arguments, I get the network detection page even if I have a valid connection.

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

115. By Diego Sarmentero on 2012-01-18

Reordering wizard pages.

116. By Diego Sarmentero on 2012-01-18

Adding test to check that network detection page is not the first or second one.

117. By Diego Sarmentero on 2012-01-18

Fixing comment

118. By Diego Sarmentero on 2012-01-18

Fixing case in comment

[Natalia Bidart (nataliabidart)]

Looks good, but the "Try Again" button is not the default button when starting the installer without any option. See screenshot http://ubuntuone.com/0BEoQHRLiR0r9PI3sGHA2l

Could you please add that, so we're consistent with the page when running with the --installer swicth?

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

119. By Diego Sarmentero on 2012-01-24

Fixed try again button style.

120. By Diego Sarmentero on 2012-01-25

Adding Test for try again button properties

121. By Diego Sarmentero on 2012-01-25

removed unnecessary methods.

[Natalia Bidart (nataliabidart)]

Looks good!
And works as expected.

review: Approve

[Alejandro J. Cura (alecu)]

As discussed on IRC, setMinimum(Height|Width) should not be changed to setFixed(Height|Width)

review: Needs Fixing

[Alejandro J. Cura (alecu)]

The rest looks fine, I'm about to approve this branch pending the fix just above.

[lp:~diegosarmentero/ubuntuone-windows-installer/network-detect]

122. By Diego Sarmentero on 2012-01-26

Changing back setFixed to setMinimum

[Alejandro J. Cura (alecu)]

A long time ago, in a repository far far away... this branch started!
It's nice to see it finally landing!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2012-01-09 21:50:40 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2012-01-26 14:48:26 +0000
@@ -18,8 +18,10 @@
 
 import gettext
 
+from twisted.internet import defer
 from PyQt4 import QtGui, QtCore
 
+from ubuntu_sso import networkstate
 from ubuntu_sso.qt.gui import (
     SSOWizardPage,
     EmailVerificationPage,
@@ -74,6 +76,7 @@
 from ubuntuone_installer.gui.qt.folders import FoldersPage
 from ubuntuone_installer.gui.qt.forgotten import ForgottenPasswordController
 from ubuntuone_installer.gui.qt.local_folders import LocalFoldersPage
+from ubuntuone_installer.gui.qt.network_detection import NetworkDetectionPage
 from ubuntuone_installer.gui.qt.preferences import PreferencesPage
 from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
 from ubuntuone_installer.gui.qt.setup_account import SetupAccountPage
@@ -151,7 +154,6 @@
     """Wizard Page that displays the license info and links to the GPL."""
 
     def __init__(self, parent=None):
-        self._next_id = None
         super(LicensePage, self).__init__(license_ui.Ui_Form(), None, parent)
         self.header.setVisible(False)
         self.ui.textBrowser.setHtml(qt.LICENSE_CONTENT)
@@ -163,7 +165,7 @@
     def initializePage(self):
         """Setup UI details."""
         # Set the right texts and connections for buttons
-        self.setButtonText(QtGui.QWizard.NextButton, _("Agree && continue"))
+        self.setButtonText(QtGui.QWizard.CustomButton1, _("Agree && continue"))
         self.setButtonText(QtGui.QWizard.CancelButton,
             _("Disagree && uninstall"))
 
@@ -179,19 +181,30 @@
             QtGui.QWizard.CancelButton,
             QtGui.QWizard.BackButton,
             QtGui.QWizard.Stretch,
-            QtGui.QWizard.NextButton,
-            QtGui.QWizard.FinishButton])
+            QtGui.QWizard.CustomButton1])
 
-        self.agree_button = self.wizard().button(QtGui.QWizard.NextButton)
+        self.agree_button = self.wizard().button(QtGui.QWizard.CustomButton1)
         self.agree_button.setDefault(True)
         self.agree_button.style().unpolish(self.agree_button)
         self.agree_button.style().polish(self.agree_button)
+        self.wizard().customButtonClicked.connect(self.check_connection)
+
+    # pylint: disable=W0212
+    @defer.inlineCallbacks
+    def check_connection(self, button_id):
+        """Decide next ID based on network detection."""
+        if button_id == QtGui.QWizard.CustomButton1:
+            connected = yield self.wizard().check_connection()
+            if connected:
+                self.next = self.wizard().SIGN_IN_PAGE_ID
+            else:
+                self.next = self.wizard()._next_id
+            self.wizard().next()
+    # pylint: enable=W0212
 
     def nextId(self):
-        """Return next page's ID."""
-        if self._next_id is None:
-            return self.wizard().SIGNIN_PAGE
-        return self._next_id
+        """Return the next page ID."""
+        return self.next
 
 
 class SignInPage(SSOWizardPage):
@@ -394,6 +407,7 @@
         # pylint: disable=C0103
         self.license_page = LicensePage()
         self.LICENSE_PAGE = self.addPage(self.license_page)
+        self.network_page = NetworkDetectionPage()
 
         #SSO Pages
         title_page = TITLE_STYLE % SIGN_IN
@@ -450,7 +464,8 @@
         self.reset_password.ui.reset_password_button.clicked.connect(
             self.overlay.show)
 
-        self.SIGNIN_PAGE = self.addPage(self.sign_in_page)
+        self.SIGN_IN_PAGE_ID = self.addPage(self.sign_in_page)
+        self.NETWORK_DETECTION_PAGE_ID = self.addPage(self.network_page)
         self.setup_account_page_id = self.addPage(self.setup_account)
         self.email_verification_page_id = self.addPage(self.email_verification)
         self.current_user_page_id = self.addPage(self.current_user)
@@ -478,15 +493,23 @@
         # Set Wizard buttons style
         self.button(QtGui.QWizard.NextButton).setDefault(True)
 
+        self.set_start_page(installing)
+
+    # Invalid name "closeEvent"
+    # pylint: disable=C0103
+
+    @defer.inlineCallbacks
+    def set_start_page(self, installing):
+        """Set the Wizard start page based in some conditions."""
+        connected = yield self.check_connection()
         if installing:
             self.setStartId(self.LICENSE_PAGE)
-        else:
+        elif connected:
             self.setStartId(self.SIGNIN_PAGE)
+        else:
+            self.setStartId(self._next_id)
         self.restart()
 
-    # Invalid name "closeEvent"
-    # pylint: disable=C0103
-
     def critical(self, message, page=None):
         """Show a message at the bottom of the page on form errors."""
         self.overlay.hide()
@@ -513,6 +536,16 @@
         else:
             return QtGui.QWizard.nextId(self)
 
+    @defer.inlineCallbacks
+    def check_connection(self):
+        """Return is machine is connected, False set Network Page as next."""
+        # pylint: disable=W0703
+        connected = yield networkstate.is_machine_connected()
+        if not connected:
+            self._next_id = self.NETWORK_DETECTION_PAGE_ID
+        defer.returnValue(connected)
+        # pylint: enable=W0703
+
     def login_success_slot(self):
         """Called on successful login."""
         self._next_id = self.SUCCESS_PAGE

=== added file 'ubuntuone_installer/gui/qt/network_detection.py'
--- ubuntuone_installer/gui/qt/network_detection.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/network_detection.py	2012-01-26 14:48:26 +0000
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 *-*
+#
+# 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/>.
+
+"""Widget to show if we don't detect a network connection."""
+
+import gettext
+
+from twisted.internet import defer
+from PyQt4 import QtGui
+
+from ubuntu_sso import networkstate
+
+from ubuntuone_installer.gui.qt.ui import network_detection_ui
+
+_ = gettext.gettext
+
+
+class NetworkDetectionPage(QtGui.QWizardPage):
+
+    """Widget to show if we don't detect a network connection."""
+
+    def __init__(self, parent=None):
+        super(NetworkDetectionPage, self).__init__(parent)
+        self.setTitle(_("Installing Ubuntu One"))
+        self.ui = network_detection_ui.Ui_Form()
+        self.ui.setupUi(self)
+        self.btn_try_again = None
+
+    # pylint: disable=C0103
+    def initializePage(self):
+        """Set UI details."""
+        self.wizard()._next_id = None
+
+        self.setButtonText(QtGui.QWizard.CustomButton1, _("Try again"))
+        self.setButtonText(QtGui.QWizard.CancelButton,
+            _("Close window and set up later"))
+        self.wizard().setButtonLayout([
+            QtGui.QWizard.Stretch,
+            QtGui.QWizard.CustomButton1,
+            QtGui.QWizard.CancelButton,
+            ])
+
+        try:
+            self.wizard().customButtonClicked.disconnect()
+        except TypeError:
+            pass
+
+        self.btn_try_again = self.wizard().button(QtGui.QWizard.CustomButton1)
+        self.btn_try_again.setDefault(True)
+        self.btn_try_again.style().unpolish(self.btn_try_again)
+        self.btn_try_again.style().polish(self.btn_try_again)
+        self.wizard().customButtonClicked.connect(self.try_again)
+    # pylint: enable=C0103
+
+    @defer.inlineCallbacks
+    def try_again(self, button_id=QtGui.QWizard.CustomButton1):
+        """Test the connection again."""
+        if button_id == QtGui.QWizard.CustomButton1:
+            d = yield networkstate.is_machine_connected()
+            if d:
+                self.wizard()._next_id = self.wizard().SIGN_IN_PAGE_ID
+                self.wizard().next()
+                self.wizard()._next_id = None

=== modified file 'ubuntuone_installer/gui/qt/tests/__init__.py'
--- ubuntuone_installer/gui/qt/tests/__init__.py	2012-01-03 15:00:57 +0000
+++ ubuntuone_installer/gui/qt/tests/__init__.py	2012-01-26 14:48:26 +0000
@@ -156,6 +156,7 @@
         self.overlay = FakeOverlay()
         self.called = []
         self.buttons = {}
+        self._next_id = -1
 
     # Invalid name "setButtonLayout", "setOption"
     # pylint: disable=C0103
@@ -177,11 +178,16 @@
 
 class FakeWizardButtonStyle(FakeWizard):
 
+    """Fake Wizard with button style implementation."""
+
+    SIGN_IN_PAGE_ID = 1
+
+    # pylint: disable=C0103
     def __init__(self):
         super(FakeWizardButtonStyle, self).__init__()
         self.data = {}
+        self.customButtonClicked = self
 
-    # pylint: disable=C0103
     def setDefault(self, value):
         """Fake setDefault for button."""
         self.data['default'] = value
@@ -191,6 +197,14 @@
         return self.data['default']
     # pylint: enable=C0103
 
+    def connect(self, func):
+        """Fake customButtonClicked connect."""
+        self.data['connect'] = func
+
+    def disconnect(self, func):
+        """Fake customButtonClicked disconnect."""
+        self.data['disconnect'] = func
+
     def button(self, button_id):
         """Fake the functionality of button on QWizard class."""
         return self
@@ -207,6 +221,10 @@
         """Fake unpolish."""
         self.data['unpolish'] = button
 
+    def next(self):
+        """Fake next for wizard."""
+        self.data['next'] = True
+
 
 class FakeWizardPage(object):
 

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2012-01-03 15:00:57 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2012-01-26 14:48:26 +0000
@@ -129,10 +129,21 @@
         self.patch(qt.folders, "FoldersPanel", FakeFoldersPanel)
         self.patch(gui.qt.utils, "add_syncdaemon_to_autostart", NO_OP)
         self.patch(gui.backend, "ControlBackend", FakeBackend)
+        self.patch(gui.networkstate, "is_machine_connected",
+            lambda: defer.succeed(True))
         yield super(MainWindowTestCase, self).setUp()
         setup_page = self.ui.page(self.ui.setup_account_page_id)
         setup_page.initializePage()
 
+    def test_check_network_id(self):
+        """Check that the Network Detect page is not the first one."""
+        win = gui.MainWindow()
+        # Check that NETWORK_DETECTION_PAGE_ID is greater than 1,
+        # this means that is not the first or second page, which should be
+        # LICENSE and SIGN_IN.
+        # (SIGN_IN will be the first running without --install)
+        self.assertTrue(win.NETWORK_DETECTION_PAGE_ID > 1)
+
     # pylint: disable=E1101
     def test_setup_account_controller_params(self):
         """Test with SetupAccountController params."""
@@ -141,6 +152,93 @@
         self.assertEqual(val, win)
         self.assertEqual(win.setup_controller.args[0], ())
 
+    def test_network_detection_connection_enabled(self):
+        """Test the flow of the pages without connection."""
+        self.patch(gui.networkstate, "is_machine_connected",
+            lambda: defer.succeed(True))
+        license_page = self.ui.page(self.ui.LICENSE_PAGE)
+        self.ui.setStartId(self.ui.LICENSE_PAGE)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        license_page.check_connection(QtGui.QWizard.CustomButton1)
+        page_id = license_page.next
+        self.assertEqual(page_id, self.ui.SIGN_IN_PAGE_ID)
+
+    def test_network_detection_connection_disabled(self):
+        """Test the flow of the pages with connection."""
+        self.patch(gui.networkstate, "is_machine_connected",
+            lambda: defer.succeed(False))
+        license_page = self.ui.page(self.ui.LICENSE_PAGE)
+        self.ui.setStartId(self.ui.LICENSE_PAGE)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        license_page.check_connection(QtGui.QWizard.CustomButton1)
+        page_id = license_page.next
+        self.assertEqual(page_id, self.ui.NETWORK_DETECTION_PAGE_ID)
+
+    def test_license_page_check_connection_no_button(self):
+        """Check the state of next when another button is pressed."""
+        license_page = self.ui.page(self.ui.LICENSE_PAGE)
+        self.ui.setStartId(self.ui.LICENSE_PAGE)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        license_page.next = -1
+        license_page.check_connection(QtGui.QWizard.NextButton)
+        page_id = license_page.next
+        self.assertEqual(page_id, -1)
+
+    def test_network_detection_retry_fail(self):
+        """Test the flow of the pages when the retry button is pressed."""
+        self.patch(gui.networkstate, "is_machine_connected",
+            lambda: defer.succeed(False))
+        network_page = self.ui.page(self.ui.NETWORK_DETECTION_PAGE_ID)
+        self.ui.setStartId(self.ui.NETWORK_DETECTION_PAGE_ID)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        network_page.try_again()
+        self.assertEqual(self.ui.currentId(),
+            self.ui.NETWORK_DETECTION_PAGE_ID)
+
+    # pylint: disable=W0212
+    @defer.inlineCallbacks
+    def test_check_connection_with_connection(self):
+        """Test the check_connection function with connection = True."""
+        self.patch(gui.networkstate, "is_machine_connected",
+            lambda: defer.succeed(True))
+        self.ui._next_id = -1
+        connected = yield self.ui.check_connection()
+        self.assertNotEqual(self.ui._next_id,
+            self.ui.NETWORK_DETECTION_PAGE_ID)
+        self.assertTrue(connected)
+
+    @defer.inlineCallbacks
+    def test_check_connection_with_no_connection(self):
+        """Test the check_connection function with connection = False."""
+        self.patch(gui.networkstate, "is_machine_connected",
+            lambda: defer.succeed(False))
+        connected = yield self.ui.check_connection()
+        self.assertEqual(self.ui._next_id, self.ui.NETWORK_DETECTION_PAGE_ID)
+        self.assertFalse(connected)
+        self.assertFalse(False)
+    # pylint: enable=W0212
+
+    def test_network_detection_retry_works(self):
+        """Test the flow of the pages when the retry button is pressed."""
+        self.patch(gui.networkstate, "is_machine_connected",
+            lambda: defer.succeed(True))
+        network_page = self.ui.page(self.ui.NETWORK_DETECTION_PAGE_ID)
+        self.ui.setStartId(self.ui.NETWORK_DETECTION_PAGE_ID)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        network_page.try_again()
+        self.assertNotEqual(self.ui.currentId(),
+            self.ui.NETWORK_DETECTION_PAGE_ID)
+
     def test_current_user_controller_params(self):
         """Test with CurrentUserController params."""
         win = gui.MainWindow()
@@ -183,11 +281,20 @@
             unicode(self.ui.sign_in_page.ui.message_label.text()),
             u"")
 
-    def test_without_flag(self):
+    def test_without_flag_connected(self):
         """test with flag activated."""
+        self.patch(gui.networkstate, "is_machine_connected",
+            lambda: defer.succeed(True))
         win = gui.MainWindow()
         self.assertEqual(win.startId(), win.SIGNIN_PAGE)
 
+    def test_without_flag_disconnected(self):
+        """test with flag activated."""
+        self.patch(gui.networkstate, "is_machine_connected",
+            lambda: defer.succeed(False))
+        win = gui.MainWindow()
+        self.assertEqual(win.startId(), win.NETWORK_DETECTION_PAGE_ID)
+
     def test_initialize_page(self):
         """Check the initializePage to ensure proper widgets visibility."""
         setup_page = self.ui.page(self.ui.setup_account_page_id)

=== added file 'ubuntuone_installer/gui/qt/tests/test_network_detection.py'
--- ubuntuone_installer/gui/qt/tests/test_network_detection.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/tests/test_network_detection.py	2012-01-26 14:48:26 +0000
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 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
+# 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/>.
+
+"""The test suite for Network Detection UI."""
+
+from twisted.internet import defer
+
+from PyQt4 import QtGui
+
+from ubuntuone_installer.gui.qt import network_detection
+from ubuntuone_installer.gui.qt.tests import (
+    BaseTestCase,
+    FakeWizardButtonStyle,
+)
+
+
+class NetworkDetectionTestCase(BaseTestCase):
+
+    """Test the CurrentUserController."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Initialize this test instance."""
+        yield super(NetworkDetectionTestCase, self).setUp()
+        self.wizard = FakeWizardButtonStyle()
+        self.network_detection_page = network_detection.NetworkDetectionPage()
+        self.patch(self.network_detection_page, 'wizard', self._get_wizard)
+
+    def _get_wizard(self):
+        """Fake wizard method for wizard page."""
+        return self.wizard
+
+    # pylint: disable=W0212
+    def test_initialize_page(self):
+        """Check Network detection initialize page."""
+        self.network_detection_page.initializePage()
+        self.assertEqual(self.wizard._next_id, None)
+        self.assertTrue(('setButtonLayout', ([
+            QtGui.QWizard.Stretch,
+            QtGui.QWizard.CustomButton1,
+            QtGui.QWizard.CancelButton], {})),
+            self.wizard.called)
+
+    def test_initialize_page_button_property(self):
+        """Test the Try Again button properties."""
+        self.patch(self.network_detection_page,
+            "wizard", FakeWizardButtonStyle)
+        self.network_detection_page.initializePage()
+        self.assertTrue(self.network_detection_page.btn_try_again.isDefault())
+        self.assertTrue(
+            'polish' in self.network_detection_page.btn_try_again.data)
+        self.assertTrue(
+            'unpolish' in self.network_detection_page.btn_try_again.data)
+        self.assertEqual(
+            self.network_detection_page.btn_try_again.data['polish'],
+            self.network_detection_page.btn_try_again)
+        self.assertEqual(
+            self.network_detection_page.btn_try_again.data['unpolish'],
+            self.network_detection_page.btn_try_again)
+
+    def test_try_again_with_connection(self):
+        """Check try again method with connection."""
+        self.patch(network_detection.networkstate, 'is_machine_connected',
+            lambda: True)
+        self.wizard._next_id = -1
+        if 'next' in self.wizard.data:
+            self.wizard.data.pop('next')
+        self.network_detection_page.try_again()
+        self.assertEqual(self.wizard._next_id, None)
+        self.assertTrue(self.wizard.data.get('next', False))
+
+    def test_try_again_without_connection(self):
+        """Check try again method without connection."""
+        self.patch(network_detection.networkstate, 'is_machine_connected',
+            lambda: False)
+        self.wizard._next_id = -1
+        if 'next' in self.wizard.data:
+            self.wizard.data.pop('next')
+        self.network_detection_page.try_again()
+        self.assertEqual(self.wizard._next_id, -1)
+        self.assertFalse(self.wizard.data.get('next', False))
+    # pylint: enable=W0212