Merge lp://qastaging/~brian.curtin/ubuntuone-control-panel/autostart-clean into lp://qastaging/ubuntuone-control-panel

If we're a already calling add_to_autostart from ubuntuone/controlpanel/gui/qt/gui.py, why would you also add it in the wizard code?

Unless I'm missing something (please let me know), there is no need to do that. Also, semantically, the wizard is a 're usable' widget, and we would not like to leak thing like adding to autostart when using it.

Adding tho the comments of natalia, I would call the parents setup before I do any patching or operations. Also I would not add the setup of we only have one test, but im lazy :)

Rev 301 removes the call Natalia was talking about.

Manuel: I need that ordering in the setUp because I need add_to_autostart patched before anything else up the chain runs. The add_to_autostart is called when MainWindow is created, and it's created within BaseTestCase, so I have to get patched in before then.

ubuntuone/controlpanel/gui/qt/tests/test_gui.py:
    130: [C0111, AutoStartTestCase.test_add_to_autostart] Missing docstring

ubuntuone/controlpanel/utils/tests/test_windows.py:
    162: [W0622, AutostartTestCase.test_add_syncdaemon_to_autostart] Redefining built-in 'dir'

ubuntuone/controlpanel/utils/windows.py:
    22: [F0401] Unable to import '_winreg'

Rev 303 fixes the remaining lint issues.

Lookis at the logic inside add_to_autostart, is there any reason to have the "else: return" in the middle of the code? Why not just:

def add_to_autostart():
    """Add syncdaemon to the session's autostart."""
    if getattr(sys, "frozen", False):
        sd_path = '"%s"' % os.path.join(os.path.dirname(
            os.path.abspath(sys.executable)),
            "ubuntuone-syncdaemon.exe")
        u1cp_path = '"%s"' % os.path.join(os.path.dirname(
            os.path.abspath(sys.executable)),
            "ubuntuone-control-panel-qt.exe")

        with _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, AUTORUN_KEY,
                             0, _winreg.KEY_ALL_ACCESS) as key:
            # pylint: disable=E0602
            _winreg.SetValueEx(key, "Ubuntu One", 0, _winreg.REG_SZ, sd_path)
            _winreg.SetValueEx(key, "Ubuntu One Icon", 0, _winreg.REG_SZ,
                               u1cp_path + " --minimized --with-icon")

That was an artifact of the old implementation from ubuntuone-windows-installer. Removed.

> Rev 301 removes the call Natalia was talking about.
>
> Manuel: I need that ordering in the setUp because I need add_to_autostart
> patched before anything else up the chain runs. The add_to_autostart is called
> when MainWindow is created, and it's created within BaseTestCase, so I have to
> get patched in before then.

Very well then.. I would have added a comment to state so to avoid stupid reviewers :)

Few things:

8 +from ubuntuone.controlpanel.utils import add_to_autostart

I know we do take a lot of effort in doing alphabetical ordered imports, can you move the import a few lines? I'm the first one to ignore this rule, but is a style we try to keep.

Besides that every thing looks good so I'll approve assuming you will order the imports!

PS: I had no idea _winreg could be a context manager!

Looks good!

+1